Removed old, unused stuff.