Cleanup to MainWindow