overlay: update & cleanup

Change-Id: Ib5aaa6a9c82914d3a4c038ffa961103ed80ec524