Only use net.minidev for testing
Actually add the MDC node to the json
Remove dead code, and field variables to be local