misc cleanups.