===> Cleaning for otter-3.0.6