Remove references to non-existant media and an unused helper class