Cleanup. Removed commented out/unused code and unrelated comments that were copy pasted from elsewhere.

Reviewer: none
Issue: none