#3577 cleaning up exclude patterns