Cleared some matches from findbugs-exclude