Removed unnecessary class