More duplicate cleanup; fix json test to pass