Remove redundant code/comments following code review by Peter