Packaging guidelines clean up