remove json and xml support, few fixes