Get rid of cruft, start to move toward restarting clients.