refactoring due to server splitoff