Comment out all mess so we can actually build the client for now. Most of the code will need to be rewritten to the new interface