quick and dirty cleanups