remove unused precursor to Testify
cleanup and refactoring