Cleaned out a bunch of leftover junk from kitsune days.
Merge pull request #2104 from rlr/sumo-cleanout

Cleaned out a bunch of leftover junk from kitsune days.