Integrated cleanup with media branch