Moving globals to particular agents, to /dev/null and associtated clean-ups