Clean-up overlay

Change-Id: I216870fd2f42652b107c897fed8864c22c3589d4