package cleanups