Remove Unused Overlays

Change-Id: I7415548beb6c9cfa3d015d3c3460d54f2a344dd4