Part 12: Remove old rest-dispatch generators