Remove unwanted overlays

Change-Id: I562b34cc74174c7e53e0a436d46717075251f05a