Removed some TODO and unused MainWindow.java