===> Cleaning for sword-1.6.1