Remove unwanted overlays

Change-Id: Iccc9d6a3182b7a0bf756fe5b61dc3f79732c611d