[cs] cleanup develop