Correct Gesture remove refactoring