Overlay: Remove unused stuff

Change-Id: Id1a5cb9f3eb9d44c966a991042aa298e4ef4f286