Updated to remove agents