Removed redudant class