Client: Removed test code