Removed unneeded class & test case.