CON-1993 | clean up