Card 218: Add support for JSON cleanup