Clean up regex filtering