Removal of Unix dependency