Removed Windows-related code from masterbranch. Windows support has it's own branch.