Remove overlays

Change-Id: Ic4cb86a0daea035ab45214cda374cd34a587beb8