ENH: more clean-up