Clean-up overlay

Change-Id: Iaae25cf3d2bd42f3f853fcd45d52afe7fb5857ff