refactor, remove gest