Remove overlays - round 1

Change-Id: Ib38cb256995c27e6ec99b2f812254bc2e5ac4782