Cleanup

* Revert "Track display/media-caf-7x30"

* Fix space issues

* Track moar CM repos