removed some old junk
now with 96% test coverage