CqlUtils cleanup