various cleanups.