===> Cleaning for kibi-0.3.1