DATACASS-47: Completed removal of class, refactoring, and unit test
cleanup.