Removed unneeded code, added commands for both Windows and OSX