some more cleanups for common parts