Package cleanup and verification addition