===> Cleaning for cstream-2.7.5