first removal of validation code. need to confirm it's all gone.