unrelated cleanups