Cleanups - remove window.cpp as well