Remove redundant class