JAL-1705 unused import removed