Remove redundant feature check