Removing Windows and OSX logic