This class has an unused private helper class - might as well get rid of it since there are already a bunch of other changes in here.