Clean up of basewindow almost complete