===> Cleaning for khal-0.13.0