Use an ext_package on the verifier call
Remove some commented out code