Removed client server wrapping.