Remove overlays

Change-Id: I7e58acb946f2f1ddf3ba024cd9e5b7535bc7c0df