Removed old pre-validation trim()