Certainly the old code must stay because only a fraction of the users will have xinput2 and we also need to work on old Xservers and Xservers (e.g. remote X11) without xinput2. This is also one of the things which complicates the design because big chunks need to be rewritten, some stuff needs to be moved to explorer and both the old/new stuff have to work.