Remove jobs and simplify build code.
Minor comment fix
Introduce pluggable strategies for build types