Removing call to cleanup on short-circuit exit where existing server is running.