Some deletions and a better charity user spec