- various cleanups