clean up overlays

Change-Id: I92b1cc1f95bbbcf1ade7642fc786db3aeb7d79f9