WICKET-5147 comment clean up