removed mac specific things