BUG-1611: use CharMatcher to remove characters