Remove make and remove dependency on entity_view_mode.