End of major server side refactoring