Cleanup for removing diff algorithms.  Still WIP.