rm dead code
rm dead code
rm dead comments
make static code object oriented
cleanup
rm abstract class and move all code into the only implementing class