Cleaned up the flow through the server.