Removed unused code. Compile on Windows etc.