Cleaning up files and code related to windows
Merge branch 'MaciekBaron-master'