Remove commented out code. Remove redundant function calls.