trivial cleanups