Remove some overlays for now

Change-Id: I269c76ec284155ded63fd6a0cd71178752423698