Remove non-validation code