REL-2090: Code cleanup and removal of no longer relevant (and confusing) comment.