Removed test client and commented code.