Refactoring on Gesture remove