Remove commented out code. Remove redundant function calls.
Merge pull request #879 from monaka/pr-remove-redundant-funcalls

Remove commented out code. Remove redundant function calls.