Revert "Avoid string to be JSonfy"

This reverts commit bbb7b903761671275f858e512feb26632fafe57a.
Cleanup code
Merge remote-tracking branch 'upstream/master'