Remove some overlays for now

Change-Id: I1eaaca02f98b2798efbd69e1b75068d2399832da