code re-organisation; remove Agent::GetInstance()