random cleanups