Further improvements, Agents are now unregistered