End of major client side refactoring