Remove some more overlays

Change-Id: I27d59348026051bdb25ae08456678b3d2fcc3918