Housekeeping

Cleaning up in preparation for heterogenous food, new breeds of agent,
etc.