Changed how the remove media works, so it only deletes media, rather then first retrieving the Media objects