Updated remove media impl