NickiToUpstream: Remove CMHome as well