colour build fixes, rm some dead code