Remove replanning steps