[CLEANUP] -- Reverting JSON dependency