Removed Redundant Class