Begin cleaning up a few package sections.