cleanup overlays

Change-Id: Ic977e40db2b8be52d8a16777cc43d8b7172cc867