Removed unused validation code