minor code reorg; remove unnecessary JSON marshallers

Fixed. Used to have debugging code in between :)