Bugfixs for Windows
Removed unused files