removed mac specific stuff