remove dead code.
Refactor a bit, catch some errors and add metadata to dh messages noting them as whispers.