minor cleanups
cleanup crossfeed