clean up diff for media-inject focused review