===> Cleaning for sunwait-0.8