Filters folder cleanup II