Remove overlays for now

Change-Id: Id678c454ef8983b7ef365c0d38f54df87ebaafca