cleanup overlays

Change-Id: I4f626441960db916b4cdbc0dea5e13bcc61e0bd9