Get rid of unused overlays

Change-Id: I1d5ad628c9e8bd073f45477293a3a9fb786d6dea