Revert "Implement seperated server-so model"