clean out some copy-pasted cruft