===> Cleaning for mstream-1.3