cleanup overlays

Change-Id: I9bd66eb788f8b5d07e59d286bf561bfdf8185c0a