===> Cleaning for khal-0.9.3