misc cleanups