some additional cleanups