Remove code that was duplicated with merge of iMedia 2 pull request