Got everything working on windows.
Removed old code.