ADEN-720 SevenOne Media cleanup