After removing validation class