Re: Packaging guidelines clean up