Cleaning some stuff for mac-only use