JAL-2480 remove redundant method, further test coverage