Overlay: Clean up, and reduce redundant code

Change-Id: I7f776a504b99ec1a1a8cbbae191ff454bd56fcfc