Further removed unused stuff.