more packaging cleanups