Json cleanup