Minor tweaks.

Removed unused stuff.