Eliminate a pile of code that isn't used anymore now the new send code
is in place, and make some cosmetic changes.