Remove undefined overlays

Change-Id: Iff4fde7c473ed85c186c371127bb9bd852fff50d