Move method bug fix - added final removeEventListener