ZEN-13906: Clean up grid columns for Instance