removed a bunch of old code