clean up validator