more clean up on verification