===> Cleaning for grig-0.8.0