Cleanup for OS X