cleanup more overlay

Change-Id: Ica394acda54a73518c368d94a687aca9dcfd4f7e