Removed old json_encode stuff

Merge conflict resolution ,... this is part of 5.2 updates

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>