Remove invalid_value class before validation