Remove entity_view_mode dependency