Fix to remove_filter-function, which is not ready yet