Serious cleanup

This reverts all of my foolery from d7f690d6d03c40109977645760005c32278f334e.  Similar to https://github.com/canaryio/canaryd/pull/65 in which too many deps are causing too many problems.  There is a longer term plan here, but the least I can do is clean these up now.