And here's the full updated diff. I think this is now safe in terms of not deleting things needed for old clients or old servers. -- Martin <http://launchpad.net/~mbp/>