removed validation code