more cleanups of this stuff