PBJSON cleanup