Hmm. We should probably send one or the other, but not both. i.e. remove from line 153. Seem reasonable?