Cleanup User JSON conversion