cleanup overlays

Change-Id: Iaa2542ffe1724fd51d1f4dca97693301a43e08be