killing off an unnecessary class
marked class deprecated
more style cleanups