Cleanup of unused code. -Jon
Fixing verification of verify never to pass when used with differing parameters. -Jon