more misc cleanups