CON-1298 cleanup