Removed some unused stuff.