Overlay: Clean up, and reduce redundant code

Change-Id: I89e799e0fcb1f6b49631eba70bbc80da685bef0a