Clean up old JSON code