Cleaned up agent and tag manager
Still cleaning up