remove code that was mistakenly kept through the previous conflict
remove the IterSafe algorithm