===> Cleaning for stava-0.6.2