removed mac related stuff