Eliminate dead code
Eliminate all uses of given/when from Comment.pm