organization validation on client side
cleanup validation code