Removed mac porting