Simplify code based on new way of keeping clients in sync
Remove some code that is no longer necessary with new way of dealing with kinetic drag