Remove unused secondary compile master, minor tweaks