Implement lazy-removing feature