Removed JSON parsing from client