Removed some unnecessary code.
Fixed .. in unite on windows.