Removed OS X specifics