Removed unused vars.
Cleanup.