removed mac stuff