Remove redundant code and fix comment per Paul's review feedback.