Remove unwanted overlays

Change-Id: Iafb68d617fd1653048f3c78eb199b32c8849e17d