JAL-1668 finally clean up