Remove unwanted overlays

Change-Id: I8e32a6bcf860483246e966af1615c8f2967ee628