- Minor cleanup, removed unused stuff.