A little it of cleanup and removed a class I no longer needed.