#JC-1668 clean