ENH: working on clean mavericks