Remove CMHOME [2/2]

Change-Id: Ia46e2e9ed155dc8501090a93f9e65e897652757a