packaging cleanups