===> Cleaning for viking-0.9.8