g2: Remove CM overlays

Change-Id: I73b6ad2a89182b5ad999c43d44db8e45d47bc9f5