Premature delete filtering moved inside