Remove old and unused packages; Fix package settings for so they now work on OS X