Remove redundant validation