Removed checkbox and radio validate, requires more testing