WICKET-3335 small cleanup