filters: Cleanup and preparation for changes.