Removed unused variable.
Cleanup unused variable.
Clean up stray comments.