More cleaning up before we move on to other admin interfaces.