Removed more deprecated stuff from generate-warping-data, plus a few minor changes