remove all this unused stuff now