more mediaflag cleanup