diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index ddb53f8acb..5e1094276c 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -919,19 +919,11 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         PACKET_READ_CHECK(AvatarGlobalPosition, sizeof(AvatarDataPacket::AvatarGlobalPosition));
         auto data = reinterpret_cast<const AvatarDataPacket::AvatarGlobalPosition*>(sourceBuffer);
 
-        const float SPACE_BETWEEN_AVATARS = 2.0f;
-        const int RANDOM_RADIUS = 100;
-        const int AVATARS_PER_ROW = 3;
+        glm::vec3 offset = glm::vec3(0.0f, 0.0f, 0.0f);
 
-        glm::vec3 offset;
-
-        if (false) {
-            qsrand(static_cast<quint64>(getID().toByteArray().toInt()));
-            float xrand = float((qrand() % ((RANDOM_RADIUS + 1) - 10) + 10) / 10.0f);
-            float yrand = float((qrand() % ((RANDOM_RADIUS + 1) - 10) + 10) / 10.0f);
-            offset = glm::vec3(xrand, 0.0f, yrand);
-        }
-        else {
+        if (_replicaIndex > 0) {
+            const float SPACE_BETWEEN_AVATARS = 2.0f;
+            const int AVATARS_PER_ROW = 3;
             int row = _replicaIndex % AVATARS_PER_ROW;
             int col = floor(_replicaIndex / AVATARS_PER_ROW);
             offset = glm::vec3(row * SPACE_BETWEEN_AVATARS, 0.0f, col * SPACE_BETWEEN_AVATARS);
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 67cc9f0563..8dfee3551e 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -23,6 +23,9 @@
 
 
 void AvatarReplicas::addReplica(const QUuid& parentID, AvatarSharedPointer replica) {
+    if (parentID == QUuid()) {
+        return;
+    }
     if (_replicasMap.find(parentID) == _replicasMap.end()) {
         std::vector<AvatarSharedPointer> emptyReplicas = std::vector<AvatarSharedPointer>();
         _replicasMap.insert(std::pair<QUuid, std::vector<AvatarSharedPointer>>(parentID, emptyReplicas));
@@ -144,10 +147,12 @@ void AvatarHashMap::setReplicaCount(int count) {
     auto avatars = getAvatarIdentifiers();
     for (int i = 0; i < avatars.size(); i++) {
         KillAvatarReason reason = KillAvatarReason::NoReason;
-        removeAvatar(avatars[i], reason);
-        auto replicaIDs = _replicas.getReplicaIDs(avatars[i]);
-        for (auto id : replicaIDs) {
-            removeAvatar(id, reason);
+        if (avatars[i] != QUuid()) {
+            removeAvatar(avatars[i], reason);
+            auto replicaIDs = _replicas.getReplicaIDs(avatars[i]);
+            for (auto id : replicaIDs) {
+                removeAvatar(id, reason);
+            }
         }
     }
 }
@@ -315,7 +320,6 @@ void AvatarHashMap::processBulkAvatarTraits(QSharedPointer<ReceivedMessage> mess
             AvatarTraits::TraitWireSize traitBinarySize;
             bool skipBinaryTrait = false;
 
-
             if (AvatarTraits::isSimpleTrait(traitType)) {
                 message->readPrimitive(&traitBinarySize);
 
@@ -325,12 +329,10 @@ void AvatarHashMap::processBulkAvatarTraits(QSharedPointer<ReceivedMessage> mess
                     avatar->processTrait(traitType, traitData);
                     _replicas.processTrait(avatarID, traitType, traitData);
                     lastProcessedVersions[traitType] = packetTraitVersion;
-                }
-                else {
+                } else {
                     skipBinaryTrait = true;
                 }
-            }
-            else {
+            } else {
                 AvatarTraits::TraitInstanceID traitInstanceID =
                     QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
 
@@ -341,15 +343,13 @@ void AvatarHashMap::processBulkAvatarTraits(QSharedPointer<ReceivedMessage> mess
                     if (traitBinarySize == AvatarTraits::DELETED_TRAIT_SIZE) {
                         avatar->processDeletedTraitInstance(traitType, traitInstanceID);
                         _replicas.processDeletedTraitInstance(avatarID, traitType, traitInstanceID);
-                    }
-                    else {
+                    } else {
                         auto traitData = message->read(traitBinarySize);
                         avatar->processTraitInstance(traitType, traitInstanceID, traitData);
                         _replicas.processTraitInstance(avatarID, traitType, traitInstanceID, traitData);
                     }
                     processedInstanceVersion = packetTraitVersion;
-                }
-                else {
+                } else {
                     skipBinaryTrait = true;
                 }
             }
diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h
index e4e197a080..0f847b2a61 100644
--- a/libraries/avatars/src/AvatarHashMap.h
+++ b/libraries/avatars/src/AvatarHashMap.h
@@ -43,7 +43,7 @@
 
 class AvatarReplicas {
 public:
-    AvatarReplicas() : _replicaCount(0) {}
+    AvatarReplicas() {}
     void addReplica(const QUuid& parentID, AvatarSharedPointer replica);
     std::vector<QUuid> getReplicaIDs(const QUuid& parentID);
     void parseDataFromBuffer(const QUuid& parentID, const QByteArray& buffer);
@@ -58,7 +58,7 @@ public:
 
 private:
     std::map<QUuid, std::vector<AvatarSharedPointer>> _replicasMap;
-    int _replicaCount;
+    int _replicaCount { 0 };
 };