Summary: Just removing unneeded makefile rules and 'control' logic.
Reviewed-by: xdono