Cleanup the whole default.xml

Signed-off-by: task650 <task650@gmail.com>

Fixup more CM repos

Signed-off-by: task650 <task650@gmail.com>