cleanup
add verifier