Remove redundant class definitions