removing a bunch of old/unused stuff