Dehooroofication

Cleaned up some of the code base so that it's less hooroo-specific.

Will do more in clans.