Removed CM prebuild, fixed some repos