Clean up filters and validations