Clean-up of filtering