Remove dependency on mavericks