Add missing close brace
Add missing include
Remove remaining json related functions