===> Cleaning for citron-0.6.4