Remove more of cm's overlays...

Change-Id: I61f1fdc57485aa61b74e0e179fec73143741cbb5