JAL-1641 clean up