Remove redundant (and wrong) class parameters