Cleaning up files and code related to windows