some other cleanups