cleanup and fix up Overlay error
cleanup