JAL-2684 tidy unneeded code