removed some unused stuff.