Clean-up overlay

Change-Id: I817649fef99a66f98b191517d35af3efcfc82dd6