Add offline mode and remove two server instances