Feature/remove json kit