and remove EntityViewUtils