Tidied up OS X defaults, removed old entries.