===> Cleaning for khal-0.10.4