Overlay: Clean up, and reduce redundant code

Change-Id: I5335e975b14510e28fd7c85c82f807dc3e0ba818