Clean up after ourselves when we shut down the server.
CHECKPOINT Working on a bug