Tweak removeMedia method