Removing redundant class
Last set of feedback