Remove extra off() calls for button