removed a bunch of unused stuff