Optimized CSF cleanup