removed old validation code