Remove overlays

Change-Id: Ia5cede824fa6911c089df0c7b32ef9d203364d79