Item reordering work in progress - remove old code