Clean up charity no parsing