REMOVE: unneeded diff, multi, and weight stuff