CS + remove debug echo