Remove duplicate validation