Cleanup and remove JSON dependency