More cleanup based on Mavericks install