clean up witness finder code