add cleanup filter logic todo