filter-api: cleanup