JAL-2480 redundant code (from merge?) removed