Removed Mac stuff