===> Cleaning for viking-1.9