removed a bunch of old/unused code