clean up overlays a bit, remove uneeded stuff

Change-Id: Ia6e2a38eb63132d56098387a84ef9becfe6baeab