Overlay: Clean up, and reduce redundant code

Change-Id: I8a1e7661e8382d0c56669a9e024128a8fc155bd7