clean up some Overlay code