Remove static from validation functions