Removed dependency on Unix