A bit more cleanup in server restore.