Removed redundant class