Remove some overlays breaking build

Change-Id: Ida7632fd816b1859e058f0f5b6f95038400ee3ff