Code Cleanup: MainWindow

.. XXX comments related to CPI files, we no longer have those.