diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 008694717f..c6f5bace3a 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -369,9 +369,9 @@ Menu::Menu() {
     auto& atpMigrator = ATPAssetMigrator::getInstance();
     atpMigrator.setDialogParent(this);
     
-    QAction* assetMigration = addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,
-                                                            0, &atpMigrator,
-                                                            SLOT(loadEntityServerFile()));
+    /*QAction* assetMigration =*/ addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration,
+                                                                0, &atpMigrator,
+                                                                SLOT(loadEntityServerFile()));
     
     MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar");
 
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 9f4e7ee3cf..432149d907 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -38,7 +38,6 @@
 #include "Hand.h"
 #include "Head.h"
 #include "Menu.h"
-#include "ModelReferential.h"
 #include "Physics.h"
 #include "Recorder.h"
 #include "Util.h"
@@ -150,30 +149,6 @@ float Avatar::getLODDistance() const {
 void Avatar::simulate(float deltaTime) {
     PerformanceTimer perfTimer("simulate");
 
-    // update the avatar's position according to its referential
-    if (_referential) {
-        if (_referential->hasExtraData()) {
-            EntityTreePointer tree = qApp->getEntities()->getTree();
-            switch (_referential->type()) {
-                case Referential::MODEL:
-                    _referential = new ModelReferential(_referential,
-                                                        tree,
-                                                        this);
-                    break;
-                case Referential::JOINT:
-                    _referential = new JointReferential(_referential,
-                                                        tree,
-                                                        this);
-                    break;
-                default:
-                    qCDebug(interfaceapp) << "[WARNING] Avatar::simulate(): Unknown referential type.";
-                    break;
-            }
-        }
-
-        _referential->update();
-    }
-
     if (_scale != _targetScale) {
         setScale(_targetScale);
     }
@@ -329,9 +304,6 @@ void Avatar::removeFromScene(AvatarSharedPointer self, std::shared_ptr<render::S
 
 void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
     startRender();
-    if (_referential) {
-        _referential->update();
-    }
 
     auto& batch = *renderArgs->_batch;
 
diff --git a/interface/src/avatar/ModelReferential.cpp b/interface/src/avatar/ModelReferential.cpp
deleted file mode 100644
index 18c5e36e7a..0000000000
--- a/interface/src/avatar/ModelReferential.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-//  ModelReferential.cpp
-//
-//
-//  Created by Clement on 7/30/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <AvatarData.h>
-#include <EntityTree.h>
-#include <Model.h>
-
-#include "InterfaceLogging.h"
-#include "ModelReferential.h"
-
-ModelReferential::ModelReferential(Referential* referential, EntityTreePointer tree, AvatarData* avatar) :
-    Referential(MODEL, avatar),
-    _tree(tree) 
-{
-    _translation = referential->getTranslation();
-    _rotation = referential->getRotation();
-    unpackExtraData(reinterpret_cast<unsigned char*>(referential->getExtraData().data()),
-                    referential->getExtraData().size());
-    
-    if (!isValid()) {
-        qCDebug(interfaceapp) << "ModelReferential::copyConstructor(): Not Valid";
-        return;
-    }
-    
-    EntityItemPointer item = _tree->findEntityByID(_entityID);
-    if (item != NULL) {
-        _lastRefDimension = item->getDimensions();
-        _refRotation = item->getRotation();
-        _refPosition = item->getPosition();
-        update();
-    }
-}
-
-ModelReferential::ModelReferential(const QUuid& entityID, EntityTreePointer tree, AvatarData* avatar) :
-    Referential(MODEL, avatar),
-    _entityID(entityID),
-    _tree(tree)
-{
-    EntityItemPointer item = _tree->findEntityByID(_entityID);
-    if (!isValid() || item == NULL) {
-        qCDebug(interfaceapp) << "ModelReferential::constructor(): Not Valid";
-        _isValid = false;
-        return;
-    }
-    
-    _lastRefDimension = item->getDimensions();
-    _refRotation = item->getRotation();
-    _refPosition = item->getPosition();
-    
-    glm::quat refInvRot = glm::inverse(_refRotation);
-    _rotation = refInvRot * _avatar->getOrientation();
-    _translation = refInvRot * (avatar->getPosition() - _refPosition);
-}
-
-void ModelReferential::update() {
-    EntityItemPointer item = _tree->findEntityByID(_entityID);
-    if (!isValid() || item == NULL || _avatar == NULL) {
-        return;
-    }
-    
-    bool somethingChanged = false;
-    if (item->getDimensions() != _lastRefDimension) {
-        glm::vec3 oldDimension = _lastRefDimension;
-        _lastRefDimension = item->getDimensions();
-        _translation *= _lastRefDimension / oldDimension;
-        somethingChanged = true;
-    }
-    if (item->getRotation() != _refRotation) {
-        _refRotation = item->getRotation();
-        _avatar->setOrientation(_refRotation * _rotation, true);
-        somethingChanged = true;
-    }
-    if (item->getPosition() != _refPosition || somethingChanged) {
-        _refPosition = item->getPosition();
-        _avatar->setPosition(_refPosition + _refRotation * _translation, true);
-    }
-}
-
-int ModelReferential::packExtraData(unsigned char* destinationBuffer) const {
-    QByteArray encodedEntityID = _entityID.toRfc4122();
-    memcpy(destinationBuffer, encodedEntityID.constData(), encodedEntityID.size());
-    return encodedEntityID.size();
-}
-
-int ModelReferential::unpackExtraData(const unsigned char *sourceBuffer, int size) {
-    QByteArray encodedEntityID((const char*)sourceBuffer, NUM_BYTES_RFC4122_UUID);
-    _entityID = QUuid::fromRfc4122(encodedEntityID);
-    return NUM_BYTES_RFC4122_UUID;
-}
-
-JointReferential::JointReferential(Referential* referential, EntityTreePointer tree, AvatarData* avatar) :
-    ModelReferential(referential, tree, avatar)
-{
-    _type = JOINT;
-    if (!isValid()) {
-        qCDebug(interfaceapp) << "JointReferential::copyConstructor(): Not Valid";
-        return;
-    }
-    
-    EntityItemPointer item = _tree->findEntityByID(_entityID);
-    const Model* model = getModel(item);
-    if (isValid() && model != NULL && _jointIndex < (uint32_t)(model->getJointStateCount())) {
-        _lastRefDimension = item->getDimensions();
-        model->getJointRotationInWorldFrame(_jointIndex, _refRotation);
-        model->getJointPositionInWorldFrame(_jointIndex, _refPosition);
-    }
-    update();
-}
-
-JointReferential::JointReferential(uint32_t jointIndex, const QUuid& entityID, EntityTreePointer tree, AvatarData* avatar) :
-    ModelReferential(entityID, tree, avatar),
-    _jointIndex(jointIndex)
-{
-    _type = JOINT;
-    EntityItemPointer item = _tree->findEntityByID(_entityID);
-    const Model* model = getModel(item);
-    if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {
-        qCDebug(interfaceapp) << "JointReferential::constructor(): Not Valid";
-        _isValid = false;
-        return;
-    }
-    
-    _lastRefDimension = item->getDimensions();
-    model->getJointRotationInWorldFrame(_jointIndex, _refRotation);
-    model->getJointPositionInWorldFrame(_jointIndex, _refPosition);
-    
-    glm::quat refInvRot = glm::inverse(_refRotation);
-    _rotation = refInvRot * _avatar->getOrientation();
-    // BUG! _refPosition is in domain units, but avatar is in meters
-    _translation = refInvRot * (avatar->getPosition() - _refPosition);
-}
-
-void JointReferential::update() {
-    EntityItemPointer item = _tree->findEntityByID(_entityID);
-    const Model* model = getModel(item);
-    if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {
-        return;
-    }
-    
-    bool somethingChanged = false;
-    if (item->getDimensions() != _lastRefDimension) {
-        glm::vec3 oldDimension = _lastRefDimension;
-        _lastRefDimension = item->getDimensions();
-        _translation *= _lastRefDimension / oldDimension;
-        somethingChanged = true;
-    }
-    if (item->getRotation() != _refRotation) {
-        model->getJointRotationInWorldFrame(_jointIndex, _refRotation);
-        _avatar->setOrientation(_refRotation * _rotation, true);
-        somethingChanged = true;
-    }
-    if (item->getPosition() != _refPosition || somethingChanged) {
-        model->getJointPositionInWorldFrame(_jointIndex, _refPosition);
-        _avatar->setPosition(_refPosition + _refRotation * _translation, true);
-    }
-}
-
-const Model* JointReferential::getModel(EntityItemPointer item) {
-    EntityItemFBXService* fbxService = _tree->getFBXService();
-    if (item != NULL && fbxService != NULL) {
-        return fbxService->getModelForEntityItem(item);
-    }
-    return NULL;
-}
-
-int JointReferential::packExtraData(unsigned char* destinationBuffer) const {
-    unsigned char* startPosition = destinationBuffer;
-    destinationBuffer += ModelReferential::packExtraData(destinationBuffer);
-    
-    memcpy(destinationBuffer, &_jointIndex, sizeof(_jointIndex));
-    destinationBuffer += sizeof(_jointIndex);
-    
-    return destinationBuffer - startPosition;
-}
-
-int JointReferential::unpackExtraData(const unsigned char *sourceBuffer, int size) {
-    const unsigned char* startPosition = sourceBuffer;
-    sourceBuffer += ModelReferential::unpackExtraData(sourceBuffer, size);
-    
-    memcpy(&_jointIndex, sourceBuffer, sizeof(_jointIndex));
-    sourceBuffer += sizeof(_jointIndex);
-    
-    return sourceBuffer - startPosition;
-}
diff --git a/interface/src/avatar/ModelReferential.h b/interface/src/avatar/ModelReferential.h
deleted file mode 100644
index 810db4b8e5..0000000000
--- a/interface/src/avatar/ModelReferential.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  ModelReferential.h
-//
-//
-//  Created by Clement on 7/30/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_ModelReferential_h
-#define hifi_ModelReferential_h
-
-#include <Referential.h>
-
-class EntityTree;
-class Model;
-
-class ModelReferential : public Referential {
-public:
-    ModelReferential(Referential* ref, EntityTreePointer tree, AvatarData* avatar);
-    ModelReferential(const QUuid& entityID, EntityTreePointer tree, AvatarData* avatar);
-    virtual void update();
-    
-protected:
-    virtual int packExtraData(unsigned char* destinationBuffer) const;
-    virtual int unpackExtraData(const unsigned char* sourceBuffer, int size);
-    
-    QUuid _entityID;
-    EntityTreePointer _tree;
-};
-
-class JointReferential : public ModelReferential {
-public:
-    JointReferential(Referential* ref, EntityTreePointer tree, AvatarData* avatar);
-    JointReferential(uint32_t jointIndex, const QUuid& entityID, EntityTreePointer tree, AvatarData* avatar);
-    virtual void update();
-    
-protected:
-    const Model* getModel(EntityItemPointer item);
-    virtual int packExtraData(unsigned char* destinationBuffer) const;
-    virtual int unpackExtraData(const unsigned char* sourceBuffer, int size);
-    
-    uint32_t _jointIndex;
-};
-
-#endif // hifi_ModelReferential_h
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 5920543dca..3f6a6a1e77 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -43,7 +43,6 @@
 #include "AvatarManager.h"
 #include "Environment.h"
 #include "Menu.h"
-#include "ModelReferential.h"
 #include "MyAvatar.h"
 #include "Physics.h"
 #include "Recorder.h"
@@ -209,10 +208,6 @@ void MyAvatar::update(float deltaTime) {
         _goToPending = false;
     }
 
-    if (_referential) {
-        _referential->update();
-    }
-
     Head* head = getHead();
     head->relaxLean(deltaTime);
     updateFromTrackers(deltaTime);
@@ -540,32 +535,6 @@ void MyAvatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
     }
 }
 
-void MyAvatar::clearReferential() {
-    changeReferential(NULL);
-}
-
-bool MyAvatar::setModelReferential(const QUuid& id) {
-    EntityTreePointer tree = qApp->getEntities()->getTree();
-    changeReferential(new ModelReferential(id, tree, this));
-    if (_referential->isValid()) {
-        return true;
-    } else {
-        changeReferential(NULL);
-        return false;
-    }
-}
-
-bool MyAvatar::setJointReferential(const QUuid& id, int jointIndex) {
-    EntityTreePointer tree = qApp->getEntities()->getTree();
-    changeReferential(new JointReferential(jointIndex, id, tree, this));
-    if (!_referential->isValid()) {
-        return true;
-    } else {
-        changeReferential(NULL);
-        return false;
-    }
-}
-
 bool MyAvatar::isRecording() {
     if (!_recorder) {
         return false;
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 7347419fee..0c3b415177 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -199,10 +199,6 @@ public slots:
 
     Q_INVOKABLE void updateMotionBehaviorFromMenu();
 
-    void clearReferential();
-    bool setModelReferential(const QUuid& id);
-    bool setJointReferential(const QUuid& id, int jointIndex);
-
     bool isRecording();
     qint64 recorderElapsed();
     void startRecording();
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index a698c6f374..a4d506a748 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -40,7 +40,6 @@ AvatarData::AvatarData() :
     _sessionUUID(),
     _position(0.0f),
     _handPosition(0.0f),
-    _referential(NULL),
     _bodyYaw(-90.0f),
     _bodyPitch(0.0f),
     _bodyRoll(0.0f),
@@ -68,7 +67,6 @@ AvatarData::AvatarData() :
 AvatarData::~AvatarData() {
     delete _headData;
     delete _handData;
-    delete _referential;
 }
 
 // We cannot have a file-level variable (const or otherwise) in the header if it uses PathUtils, because that references Application, which will not yet initialized.
@@ -82,40 +80,29 @@ const QUrl& AvatarData::defaultFullAvatarModelUrl() {
 }
 
 const glm::vec3& AvatarData::getPosition() const {
-    if (_referential) {
-        _referential->update();
-    }
     return _position;
 }
 
-void AvatarData::setPosition(const glm::vec3 position, bool overideReferential) {
-    if (!_referential || overideReferential) {
-        _position = position;
-    }
+void AvatarData::setPosition(const glm::vec3 position) {
+    _position = position;
 }
 
 glm::quat AvatarData::getOrientation() const {
-    if (_referential) {
-        _referential->update();
-    }
-
     return glm::quat(glm::radians(glm::vec3(_bodyPitch, _bodyYaw, _bodyRoll)));
 }
 
-void AvatarData::setOrientation(const glm::quat& orientation, bool overideReferential) {
-    if (!_referential || overideReferential) {
-        glm::vec3 eulerAngles = glm::degrees(safeEulerAngles(orientation));
-        _bodyPitch = eulerAngles.x;
-        _bodyYaw = eulerAngles.y;
-        _bodyRoll = eulerAngles.z;
-    }
+void AvatarData::setOrientation(const glm::quat& orientation) {
+    glm::vec3 eulerAngles = glm::degrees(safeEulerAngles(orientation));
+    _bodyPitch = eulerAngles.x;
+    _bodyYaw = eulerAngles.y;
+    _bodyRoll = eulerAngles.z;
 }
 
 // There are a number of possible strategies for this set of tools through endRender, below.
 void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) {
     avatarLock.lock();
-    setPosition(position, true);
-    setOrientation(orientation, true);
+    setPosition(position);
+    setOrientation(orientation);
     avatarLock.unlock();
 }
 void AvatarData::startCapture() {
@@ -145,31 +132,25 @@ void AvatarData::endRenderRun() {
 void AvatarData::startRender() {
     glm::vec3 pos = getPosition();
     glm::quat rot = getOrientation();
-    setPosition(_nextPosition, true);
-    setOrientation(_nextOrientation, true);
+    setPosition(_nextPosition);
+    setOrientation(_nextOrientation);
     updateAttitude();
     _nextPosition = pos;
     _nextOrientation = rot;
 }
 void AvatarData::endRender() {
-    setPosition(_nextPosition, true);
-    setOrientation(_nextOrientation, true);
+    setPosition(_nextPosition);
+    setOrientation(_nextOrientation);
     updateAttitude();
     _nextAllowed = true;
 }
 
 float AvatarData::getTargetScale() const {
-    if (_referential) {
-        _referential->update();
-    }
-
     return _targetScale;
 }
 
 void AvatarData::setTargetScale(float targetScale, bool overideReferential) {
-    if (!_referential || overideReferential) {
-        _targetScale = targetScale;
-    }
+    _targetScale = targetScale;
 }
 
 void AvatarData::setClampedTargetScale(float targetScale, bool overideReferential) {
@@ -246,14 +227,14 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll) {
         setAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
     }
     // referential state
-    if (_referential != NULL && _referential->isValid()) {
-        setAtBit(bitItems, HAS_REFERENTIAL);
+    if (false) {
+        setAtBit(bitItems, HAS_REFERENTIAL); // XXX leaving this for later use
     }
     *destinationBuffer++ = bitItems;
 
-    // Add referential
-    if (_referential != NULL && _referential->isValid()) {
-        destinationBuffer += _referential->packReferential(destinationBuffer);
+    // XXX leaving this for later use
+    if (false) {
+        // destinationBuffer += _referential->packReferential(destinationBuffer);
     }
 
     // If it is connected, pack up the data
@@ -572,21 +553,10 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         _headData->_isEyeTrackerConnected = oneAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
         bool hasReferential = oneAtBit(bitItems, HAS_REFERENTIAL);
 
-        // Referential
+        // XXX leaving this for later use Referential
         if (hasReferential) {
-            Referential* ref = new Referential(sourceBuffer, this);
-            if (_referential == NULL ||
-                ref->version() != _referential->version()) {
-                changeReferential(ref);
-            } else {
-                delete ref;
-            }
-            _referential->update();
-        } else if (_referential != NULL) {
-            changeReferential(NULL);
         }
 
-
         if (_headData->_isFaceTrackerConnected) {
             float leftEyeBlink, rightEyeBlink, averageLoudness, browAudioLift;
             minPossibleSize += sizeof(leftEyeBlink) + sizeof(rightEyeBlink) + sizeof(averageLoudness) + sizeof(browAudioLift);
@@ -779,10 +749,6 @@ int AvatarData::getReceiveRate() const {
     return lrint(1.0f / _averageBytesReceived.getEventDeltaAverage());
 }
 
-bool AvatarData::hasReferential() {
-    return _referential != NULL;
-}
-
 bool AvatarData::isPlaying() {
     return _player && _player->isPlaying();
 }
@@ -946,11 +912,6 @@ void AvatarData::stopPlaying() {
     }
 }
 
-void AvatarData::changeReferential(Referential* ref) {
-    delete _referential;
-    _referential = ref;
-}
-
 void AvatarData::setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) {
     if (index == -1) {
         return;
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 3abd63bf63..8f5416e4fd 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -57,7 +57,6 @@ typedef unsigned long long quint64;
 #include "PathUtils.h"
 #include "Player.h"
 #include "Recorder.h"
-#include "Referential.h"
 
 using AvatarSharedPointer = std::shared_ptr<AvatarData>;
 using AvatarWeakPointer = std::weak_ptr<AvatarData>;
@@ -174,7 +173,7 @@ public:
     const QUuid& getSessionUUID() const { return _sessionUUID; }
 
     const glm::vec3& getPosition() const;
-    virtual void setPosition(const glm::vec3 position, bool overideReferential = false);
+    virtual void setPosition(const glm::vec3 position);
 
     glm::vec3 getHandPosition() const;
     void setHandPosition(const glm::vec3& handPosition);
@@ -199,7 +198,7 @@ public:
     void setBodyRoll(float bodyRoll) { _bodyRoll = bodyRoll; }
 
     glm::quat getOrientation() const;
-    virtual void setOrientation(const glm::quat& orientation, bool overideReferential = false);
+    virtual void setOrientation(const glm::quat& orientation);
 
     void nextAttitude(glm::vec3 position, glm::quat orientation); // Can be safely called at any time.
     void startCapture();    // start/end of the period in which the latest values are about to be captured for camera, etc.
@@ -319,7 +318,6 @@ public:
     void setOwningAvatarMixer(const QWeakPointer<Node>& owningAvatarMixer) { _owningAvatarMixer = owningAvatarMixer; }
     
     const AABox& getLocalAABox() const { return _localAABox; }
-    const Referential* getReferential() const { return _referential; }
 
     int getUsecsSinceLastUpdate() const { return _averageBytesReceived.getUsecsSinceLastEvent(); }
     int getAverageBytesReceivedPerSecond() const;
@@ -339,7 +337,6 @@ public slots:
     void setBillboardFromNetworkReply();
     void setJointMappingsFromNetworkReply();
     void setSessionUUID(const QUuid& sessionUUID) { _sessionUUID = sessionUUID; }
-    bool hasReferential();
     
     bool isPlaying();
     bool isPaused();
@@ -369,8 +366,6 @@ protected:
     glm::vec3 _position = START_LOCATION;
     glm::vec3 _handPosition;
     
-    Referential* _referential;
-
     //  Body rotation
     float _bodyYaw;     // degrees
     float _bodyPitch;   // degrees
@@ -421,7 +416,6 @@ protected:
     
     /// Loads the joint indices, names from the FST file (if any)
     virtual void updateJointMappings();
-    void changeReferential(Referential* ref);
 
     glm::vec3 _velocity;
     glm::vec3 _targetVelocity;
diff --git a/libraries/avatars/src/Referential.cpp b/libraries/avatars/src/Referential.cpp
deleted file mode 100644
index 0683580093..0000000000
--- a/libraries/avatars/src/Referential.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-//  Referential.cpp
-//
-//
-//  Created by Clement on 7/30/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <GLMHelpers.h>
-
-#include "AvatarData.h"
-#include "AvatarLogging.h"
-#include "Referential.h"
-
-Referential::Referential(Type type, AvatarData* avatar) :
-    _type(type),
-    _version(0),
-    _isValid(true),
-    _avatar(avatar)
-{
-    if (_avatar == NULL) {
-        _isValid = false;
-        return;
-    }
-    if (_avatar->hasReferential()) {
-        _version = _avatar->getReferential()->version() + 1;
-    }
-}
-
-Referential::Referential(const unsigned char*& sourceBuffer, AvatarData* avatar) :
-    _isValid(false),
-    _avatar(avatar)
-{
-    // Since we can't return how many byte have been read
-    // We take a reference to the pointer as argument and increment the pointer ouself.
-    sourceBuffer += unpackReferential(sourceBuffer);
-    // The actual unpacking to the right referential type happens in Avatar::simulate()
-    // If subclassed, make sure to add a case there to unpack the new referential type correctly
-}
-
-Referential::~Referential() {
-}
-
-int Referential::packReferential(unsigned char* destinationBuffer) const {
-    const unsigned char* startPosition = destinationBuffer;
-    destinationBuffer += pack(destinationBuffer);
-    
-    unsigned char* sizePosition = destinationBuffer++; // Save a spot for the extra data size
-    char size = packExtraData(destinationBuffer);
-    *sizePosition = size; // write extra data size in saved spot here
-    destinationBuffer += size;
-    return destinationBuffer - startPosition;
-}
-
-int Referential::unpackReferential(const unsigned char* sourceBuffer) {
-    const unsigned char* startPosition = sourceBuffer;
-    sourceBuffer += unpack(sourceBuffer);
-    char expectedSize = *sourceBuffer++;
-    char bytesRead = unpackExtraData(sourceBuffer, expectedSize);
-    _isValid = (bytesRead == expectedSize);
-    if (!_isValid) {
-        // Will occur if the new instance unpacking is of the wrong type
-        qCDebug(avatars) << "[ERROR] Referential extra data overflow";
-    }
-    sourceBuffer += expectedSize;
-    return sourceBuffer - startPosition;
-}
-
-int Referential::pack(unsigned char* destinationBuffer) const {
-    unsigned char* startPosition = destinationBuffer;
-    *destinationBuffer++ = (unsigned char)_type;
-    memcpy(destinationBuffer, &_version, sizeof(_version));
-    destinationBuffer += sizeof(_version);
-    
-    destinationBuffer += packFloatVec3ToSignedTwoByteFixed(destinationBuffer, _translation, 0);
-    destinationBuffer += packOrientationQuatToBytes(destinationBuffer, _rotation);
-    return destinationBuffer - startPosition;
-}
-
-int Referential::unpack(const unsigned char* sourceBuffer) {
-    const unsigned char* startPosition = sourceBuffer;
-    _type = (Type)*sourceBuffer++;
-    if (_type < 0 || _type >= NUM_TYPES) {
-        _type = UNKNOWN;
-    }
-    memcpy(&_version, sourceBuffer, sizeof(_version));
-    sourceBuffer += sizeof(_version);
-    
-    sourceBuffer += unpackFloatVec3FromSignedTwoByteFixed(sourceBuffer, _translation, 0);
-    sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, _rotation);
-    return sourceBuffer - startPosition;
-}
-
-int Referential::packExtraData(unsigned char *destinationBuffer) const {
-    // Since we can't interpret that data, just store it in a buffer for later use.
-    memcpy(destinationBuffer, _extraDataBuffer.data(), _extraDataBuffer.size());
-    return _extraDataBuffer.size();
-}
-
-
-int Referential::unpackExtraData(const unsigned char* sourceBuffer, int size) {
-    _extraDataBuffer.clear();
-    _extraDataBuffer.append(reinterpret_cast<const char*>(sourceBuffer), size);
-    return size;
-}
-
diff --git a/libraries/avatars/src/Referential.h b/libraries/avatars/src/Referential.h
deleted file mode 100644
index 70edecda62..0000000000
--- a/libraries/avatars/src/Referential.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  Referential.h
-//
-//
-//  Created by Clement on 7/30/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_Referential_h
-#define hifi_Referential_h
-
-#include <glm/gtx/quaternion.hpp>
-#include <glm/vec3.hpp>
-
-class AvatarData;
-
-/// Stores and enforce the relative position of an avatar to a given referential (ie. model, joint, ...)
-class Referential {
-public:
-    enum Type {
-        UNKNOWN,
-        MODEL,
-        JOINT,
-        AVATAR,
-        
-        NUM_TYPES
-    };
-    
-    Referential(const unsigned char*& sourceBuffer, AvatarData* avatar);
-    virtual ~Referential();
-    
-    Type type() const { return _type; }
-    quint8 version() const { return _version; }
-    bool isValid() const { return _isValid; }
-    bool hasExtraData() const { return !_extraDataBuffer.isEmpty(); }
-    
-    glm::vec3 getTranslation() const { return _translation; }
-    glm::quat getRotation() const { return _rotation; }
-    QByteArray getExtraData() const { return _extraDataBuffer; }
-    
-    virtual void update() {}
-    int packReferential(unsigned char* destinationBuffer) const;
-    int unpackReferential(const unsigned char* sourceBuffer);
-    
-protected:
-    Referential(Type type, AvatarData* avatar);
-    
-    // packs the base class data
-    int pack(unsigned char* destinationBuffer) const;
-    int unpack(const unsigned char* sourceBuffer);
-    // virtual functions that pack fthe extra data of subclasses (needs to be reimplemented in subclass)
-    virtual int packExtraData(unsigned char* destinationBuffer) const;
-    virtual int unpackExtraData(const unsigned char* sourceBuffer, int size);
-    
-    Type _type;
-    quint8 _version;
-    bool _isValid;
-    AvatarData* _avatar;
-    QByteArray _extraDataBuffer;
-    
-    glm::vec3 _refPosition; // position of object in world-frame
-    glm::quat _refRotation; // rotation of object in world-frame
-    glm::vec3 _lastRefDimension; // dimension of object when _translation was last computed
-    
-    glm::vec3 _translation; // offset of avatar in object local-frame
-    glm::quat _rotation; // rotation of avatar in object local-frame
-};
-
-
-#endif // hifi_Referential_h
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 5b262b273b..d58c26e72c 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -46,7 +46,6 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
     _lastEditedFromRemoteInRemoteTime(0),
     _created(UNKNOWN_CREATED_TIME),
     _changedOnServer(0),
-    _transform(),
     _glowLevel(ENTITY_ITEM_DEFAULT_GLOW_LEVEL),
     _localRenderAlpha(ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA),
     _density(ENTITY_ITEM_DEFAULT_DENSITY),
@@ -1516,7 +1515,6 @@ bool EntityItem::addAction(EntitySimulation* simulation, EntityActionPointer act
 }
 
 bool EntityItem::addActionInternal(EntitySimulation* simulation, EntityActionPointer action) {
-    assertLocked();
     assert(action);
     assert(simulation);
     auto actionOwnerEntity = action->getOwnerEntity().lock();
@@ -1570,7 +1568,6 @@ bool EntityItem::removeAction(EntitySimulation* simulation, const QUuid& actionI
 }
 
 bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulation* simulation) {
-    assertWriteLocked();
     _previouslyDeletedActions.insert(actionID, usecTimestampNow());
     if (_objectActions.contains(actionID)) {
         if (!simulation) {
@@ -1615,7 +1612,6 @@ bool EntityItem::clearActions(EntitySimulation* simulation) {
 
 
 void EntityItem::deserializeActions() {
-    assertUnlocked();
     withWriteLock([&] {
         deserializeActionsInternal();
     });
@@ -1623,8 +1619,6 @@ void EntityItem::deserializeActions() {
 
 
 void EntityItem::deserializeActionsInternal() {
-    assertWriteLocked();
-
     quint64 now = usecTimestampNow();
 
     if (!_element) {
@@ -1704,7 +1698,6 @@ void EntityItem::deserializeActionsInternal() {
 }
 
 void EntityItem::checkWaitingToRemove(EntitySimulation* simulation) {
-    assertLocked();
     foreach(QUuid actionID, _actionsToRemove) {
         removeActionInternal(actionID, simulation);
     }
@@ -1712,14 +1705,12 @@ void EntityItem::checkWaitingToRemove(EntitySimulation* simulation) {
 }
 
 void EntityItem::setActionData(QByteArray actionData) {
-    assertUnlocked();
     withWriteLock([&] {
         setActionDataInternal(actionData);
     });
 }
 
 void EntityItem::setActionDataInternal(QByteArray actionData) {
-    assertWriteLocked();
     if (_allActionsDataCache != actionData) {
         _allActionsDataCache = actionData;
         deserializeActionsInternal();
@@ -1728,8 +1719,6 @@ void EntityItem::setActionDataInternal(QByteArray actionData) {
 }
 
 void EntityItem::serializeActions(bool& success, QByteArray& result) const {
-    assertLocked();
-
     if (_objectActions.size() == 0) {
         success = true;
         result.clear();
@@ -1771,7 +1760,6 @@ const QByteArray EntityItem::getActionDataInternal() const {
 
 const QByteArray EntityItem::getActionData() const {
     QByteArray result;
-    assertUnlocked();
     withReadLock([&] {
         result = getActionDataInternal();
     });
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index f438e3f28b..e85112d4ef 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -23,6 +23,7 @@
 #include <OctreePacketData.h>
 #include <ShapeInfo.h>
 #include <Transform.h>
+#include <SpatiallyNestable.h>
 
 #include "EntityItemID.h"
 #include "EntityItemPropertiesDefaults.h"
@@ -71,31 +72,10 @@ const float ACTIVATION_ANGULAR_VELOCITY_DELTA = 0.03f;
 #define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10))
 #define debugTreeVector(V) V << "[" << V << " in meters ]"
 
-//#if DEBUG
-//  #define assertLocked() assert(isLocked())
-//#else
-//  #define assertLocked()
-//#endif
-//
-//#if DEBUG
-//  #define assertWriteLocked() assert(isWriteLocked())
-//#else
-//  #define assertWriteLocked()
-//#endif
-//
-//#if DEBUG
-//  #define assertUnlocked() assert(isUnlocked())
-//#else
-//  #define assertUnlocked()
-//#endif
-#define assertLocked()
-#define assertUnlocked()
-#define assertWriteLocked()
-
 /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
 /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
 /// one directly, instead you must only construct one of it's derived classes with additional features.
-class EntityItem : public std::enable_shared_from_this<EntityItem>, public ReadWriteLockable {
+class EntityItem : public std::enable_shared_from_this<EntityItem>, public SpatiallyNestable, public ReadWriteLockable {
     // These two classes manage lists of EntityItem pointers and must be able to cleanup pointers when an EntityItem is deleted.
     // To make the cleanup robust each EntityItem has backpointers to its manager classes (which are only ever set/cleared by
     // the managers themselves, hence they are fiends) whose NULL status can be used to determine which managers still need to
@@ -208,11 +188,11 @@ public:
     inline void setTransform(const Transform& transform) { _transform = transform; requiresRecalcBoxes(); }
 
     /// Position in meters (-TREE_SCALE - TREE_SCALE)
-    inline const glm::vec3& getPosition() const { return _transform.getTranslation(); }
-    inline void setPosition(const glm::vec3& value) { _transform.setTranslation(value); requiresRecalcBoxes(); }
+    virtual const glm::vec3& getPosition() const { return SpatiallyNestable::getPosition(); }
+    virtual void setPosition(const glm::vec3& value) { SpatiallyNestable::setPosition(value); requiresRecalcBoxes(); }
 
-    inline const glm::quat& getRotation() const { return _transform.getRotation(); }
-    inline void setRotation(const glm::quat& rotation) { _transform.setRotation(rotation); requiresRecalcBoxes(); }
+    virtual const glm::quat& getRotation() const { return SpatiallyNestable::getOrientation(); }
+    virtual void setRotation(const glm::quat& rotation) { SpatiallyNestable::setOrientation(rotation); requiresRecalcBoxes(); }
 
     inline void requiresRecalcBoxes() { _recalcAABox = true; _recalcMinAACube = true; _recalcMaxAACube = true; }
 
@@ -428,7 +408,6 @@ protected:
     quint64 _created;
     quint64 _changedOnServer;
 
-    Transform _transform;
     mutable AABox _cachedAABox;
     mutable AACube _maxAACube;
     mutable AACube _minAACube;