Removed duplicate send method, corrected merge/diff cruft.