Add clean up to window class