ENH: more cleanups