Clean up on upstream filter