diff --git a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp
deleted file mode 100644
index 7083620226b5fa40f8b3dd2449e3cf2007c6466f..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "formeditornodeinstanceview.h"
-#include "formeditorview.h"
-
-#include <modelnode.h>
-#include <QDebug>
-
-
-namespace QmlDesigner {
-
-FormEditorNodeInstanceView::FormEditorNodeInstanceView(QObject * parent) : NodeInstanceView(parent)
-{
-
-}
-
-FormEditorNodeInstanceView::~FormEditorNodeInstanceView()
-{
-}
-
-}
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp
deleted file mode 100644
index 999d8c0ec80516fb3a043b83fbfb9e46fac0bb96..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "formeditorsubwindow.h"
-
-namespace QmlDesigner {
-
-FormEditorSubWindow::FormEditorSubWindow()
-{
-}
-
-} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h b/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h
deleted file mode 100644
index de50498dc89b9c8fd4e58eafa7d1e406626be4c1..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef MANIPULATORLAYERITEM_H
-#define MANIPULATORLAYERITEM_H
-
-class ManipulatorLayerItem
-{
-public:
-    ManipulatorLayerItem();
-};
-
-#endif // MANIPULATORLAYERITEM_H
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png
deleted file mode 100644
index 3cf3c11ddbe4e08932efc2380e600982e7e3739d..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png
deleted file mode 100644
index 15e7f442a6ba6bed24dfab8a5ff7459f760c3bd3..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png
deleted file mode 100644
index 4cd7ad590a496e69462e97811fa20f658354ab74..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png
deleted file mode 100644
index 2e6083c1c81ecacb58ce16a33657741083cb117d..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp
deleted file mode 100644
index 3272462a71be7170ec20dbe0dc127f5734aad062..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "modificationgroupexception.h"
-
-/*!
-\class QmlDesigner::ModificationGroupException
-\ingroup CoreExceptions
-\brief The ModificationGroupException class provides an exception for a
-modification group.
-
-*/
-namespace QmlDesigner {
-/*!
-    Constructs an exception. \a line uses the __LINE__ macro,
-    \a function uses the __FUNCTION__ or the Q_FUNC_INFO macro, and \a file uses
-    the __FILE__ macro.
-*/
-ModificationGroupException::ModificationGroupException(int line,
-                                                   const QString &function,
-                                                   const QString &file)
- : Exception(line, function, file)
-{
-    createWarning();
-}
-
-/*!
-    Returns the type of the exception as a string.
-*/
-QString ModificationGroupException::type() const
-{
-    return "ModificationGroupException";
-}
-
-}
diff --git a/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h b/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h
deleted file mode 100644
index a9e9bbc41a89aedd5e4b2c0640f0288f329ae0d3..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef REPLACEALLOBJECTDEFINITIONSVISITOR_H
-#define REPLACEALLOBJECTDEFINITIONSVISITOR_H
-
-#include "qmlrewriter.h"
-
-namespace QmlDesigner {
-namespace Internal {
-
-class ReplaceAllObjectDefinitionsVisitor: public QMLRewriter
-{
-public:
-    ReplaceAllObjectDefinitionsVisitor(TextModifier &textModifier,
-                                       const TextLocation &objectLocation,
-                                       const QString &newContent);
-
-protected:
-    virtual bool visit(QmlJS::AST::UiObjectDefinition *ast);
-    virtual bool visit(QmlJS::AST::UiObjectBinding *ast);
-
-private:
-    void replaceMembers(QmlJS::AST::UiObjectInitializer *initializer);
-
-private:
-    QString m_newContent;
-};
-
-} // namespace Internal
-} // namespace QmlDesigner
-
-#endif // REPLACEALLOBJECTDEFINITIONSVISITOR_H
diff --git a/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h b/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h
deleted file mode 100644
index 40f45d550fef043c88409ba5c13cdf4456adcb16..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef WIDGETPLUGIN_HELPER_H
-#define WIDGETPLUGIN_HELPER_H
-
-#define QMLDESIGNER_REGISTER_WIDGET(TYPE) uiEngine->addObjectCreator(new QUiWidgetCreator<TYPE>(QStringLiteral(#TYPE)));
-#define QMLDESIGNER_REGISTER_GRAPHICSWIDGET(TYPE) uiEngine->addObjectCreator(new QUiGraphicsWidgetCreator<TYPE>(QStringLiteral(#TYPE)));
-
-#endif //WIDGETPLUGIN_HELPER
-
diff --git a/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp b/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp
deleted file mode 100644
index cc2451ee8028b49a392f01e080cca61efaafd867..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "bytearraymodifier.h"
-
-namespace QmlDesigner {
-
-ByteArrayModifier::ByteArrayModifier(QPlainTextEdit* textEdit):
-        PlainTextEditModifier(textEdit),
-        m_textEdit(textEdit)
-{
-}
-
-ByteArrayModifier::~ByteArrayModifier()
-{
-    delete m_textEdit;
-}
-
-void ByteArrayModifier::undo()
-{
-    m_textEdit->undo();
-}
-
-void ByteArrayModifier::redo()
-{
-    m_textEdit->redo();
-}
-
-ByteArrayModifier* ByteArrayModifier::create(const QString& data)
-{
-    QPlainTextEdit* edit = new QPlainTextEdit;
-    edit->setPlainText(data);
-    return new ByteArrayModifier(edit);
-}
-
-void ByteArrayModifier::setText(const QString& text)
-{
-    m_textEdit->setPlainText(text);
-    emit textChanged();
-}
-
-}
diff --git a/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp b/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp
deleted file mode 100644
index 4330f9ec96d1171e6e325bcc5ffa50de3933d66f..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "modificationgrouptoken.h"
-
-namespace QmlDesigner {
-
-long ModificationGroupToken::uniqueNumberCounter = 0;
-
-ModificationGroupToken::ModificationGroupToken(unsigned depth):
-        m_depth(depth),
-        m_uniqueNumber(++uniqueNumberCounter)
-{
-}
-
-}
diff --git a/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp b/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp
deleted file mode 100644
index 16f932648d553d160d43df46de4e63d8bc9a79d2..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-//#include "nodeanchors.h"
-//
-//#include <model.h>
-//#include <modelnode.h>
-//
-//#include "internalnode_p.h"
-//#include "internalnodeanchors.h"
-//#include "internalnodestate.h"
-//#include "invalidargumentexception.h"
-//
-//using namespace QmlDesigner::Internal;
-//
-//namespace QmlDesigner {
-//
-///*!
-//\class QmlDesigner::NodeAnchors
-//\ingroup CoreModel
-//\brief NodeAnchors is a value holder for an anchor
-//*/
-//
-//NodeAnchors::NodeAnchors(const NodeState &nodeState):
-//        m_internalNode(nodeState.m_internalNode),
-//        m_internalNodeState(nodeState.m_internalNodeState),
-//        m_model(nodeState.m_model)
-//{
-//}
-//
-//NodeAnchors::~NodeAnchors()
-//{
-//}
-//
-//NodeAnchors::NodeAnchors(const NodeAnchors &other)
-//    :m_internalNode(other.m_internalNode),
-//    m_model(other.m_model)
-//{
-//
-//}
-//
-//NodeAnchors::NodeAnchors(const Internal::InternalNodeStatePointer &internalNodeState, Model *model):
-//        m_internalNode(internalNodeState->modelNode()),
-//        m_internalNodeState(internalNodeState),
-//        m_model(model)
-//{
-//}
-//
-//NodeAnchors &NodeAnchors::operator=(const NodeAnchors &other)
-//{
-//    m_internalNode = other.m_internalNode;
-//    m_internalNodeState = other.m_internalNodeState;
-//    m_model = other.m_model;
-//
-//    return *this;
-//}
-//
-//ModelNode NodeAnchors::modelNode() const
-//{
-//    return ModelNode(m_internalNode, m_model.data());
-//}
-//
-//bool NodeAnchors::isValid() const
-//{
-//    return m_internalNode->isValid()
-//            && m_internalNodeState->isValid() &&
-//            m_model;
-//}
-//
-//NodeState NodeAnchors::nodeState() const
-//{
-//    return NodeState(m_internalNodeState, m_internalNode, m_model.data());
-//}
-//
-//void NodeAnchors::setAnchor(AnchorLine::Type sourceAnchorLineType,
-//                const ModelNode &targetModelNode,
-//                AnchorLine::Type targetAnchorLineType)
-//{
-//    Q_ASSERT(m_internalNode->isValid());
-//    Q_ASSERT(m_internalNodeState->isValid());
-//    Q_ASSERT(modelNode().isValid());
-//
-//    m_model->setAnchor(AnchorLine(nodeState(), sourceAnchorLineType),
-//                       AnchorLine(targetModelNode.baseNodeState(), targetAnchorLineType));
-//}
-//
-//bool NodeAnchors::canAnchor(AnchorLine::Type sourceAnchorLineType,
-//                            const ModelNode & targetModelNode,
-//                            AnchorLine::Type targetAnchorLineType) const
-//{
-//    if (modelNode() == targetModelNode)
-//        return false;
-//
-//    return InternalNodeAnchors(m_internalNodeState).canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), targetAnchorLineType);
-//}
-//
-//bool NodeAnchors::canAnchor(const ModelNode & targetModelNode) const
-//{
-//    if (modelNode() == targetModelNode)
-//        return false;
-//
-//    if (possibleAnchorLines(AnchorLine::Left, targetModelNode) != AnchorLine::NoAnchor)
-//        return true;
-//    else if (possibleAnchorLines(AnchorLine::Top, targetModelNode) != AnchorLine::NoAnchor)
-//        return true;
-//    else if (possibleAnchorLines(AnchorLine::Right, targetModelNode) != AnchorLine::NoAnchor)
-//        return true;
-//    else if (possibleAnchorLines(AnchorLine::Bottom, targetModelNode) != AnchorLine::NoAnchor)
-//        return true;
-//    else if (possibleAnchorLines(AnchorLine::HorizontalCenter, targetModelNode) != AnchorLine::NoAnchor)
-//        return true;
-//    else
-//        return possibleAnchorLines(AnchorLine::VerticalCenter, targetModelNode) != AnchorLine::NoAnchor;
-//}
-//
-//AnchorLine::Type NodeAnchors::possibleAnchorLines(AnchorLine::Type sourceAnchorLineType,
-//                                                  const ModelNode & targetModelNode) const
-//{
-//    if (modelNode() == targetModelNode)
-//        return AnchorLine::NoAnchor;
-//
-//    int anchorTypes = AnchorLine::NoAnchor;
-//    const InternalNodeAnchors anchors(m_internalNodeState);
-//
-//    if (sourceAnchorLineType & AnchorLine::HorizontalMask) {
-//        if (anchors.canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), AnchorLine::Left))
-//            anchorTypes |= AnchorLine::Left;
-//        if (anchors.canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), AnchorLine::Right))
-//            anchorTypes |= AnchorLine::Right;
-//        if (anchors.canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), AnchorLine::HorizontalCenter))
-//            anchorTypes |= AnchorLine::HorizontalCenter;
-//    } else if (sourceAnchorLineType & AnchorLine::VerticalMask) {
-//        if (anchors.canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), AnchorLine::Top))
-//            anchorTypes |= AnchorLine::Top;
-//        if (anchors.canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), AnchorLine::Bottom))
-//            anchorTypes |= AnchorLine::Bottom;
-//        if (anchors.canAnchor(sourceAnchorLineType, targetModelNode.baseNodeState().internalNodeState(), AnchorLine::VerticalCenter))
-//            anchorTypes |= AnchorLine::VerticalCenter;
-//    }
-//
-//    return (AnchorLine::Type) anchorTypes;
-//}
-//
-//AnchorLine NodeAnchors::localAnchor(AnchorLine::Type anchorLineType) const
-//{
-//    return InternalNodeAnchors(m_internalNodeState).anchor(anchorLineType);
-//}
-//
-//AnchorLine NodeAnchors::anchor(AnchorLine::Type anchorLineType) const
-//{
-//    Internal::InternalNodeState::Pointer statePointer(m_internalNodeState);
-//    AnchorLine anchorLine = InternalNodeAnchors(statePointer).anchor(anchorLineType);
-//
-//    while (!anchorLine.isValid() && statePointer->hasParentState()) {
-//        statePointer = statePointer->parentState();
-//        anchorLine = InternalNodeAnchors(statePointer).anchor(anchorLineType);
-//    }
-//
-//    return anchorLine;
-//}
-//
-//bool NodeAnchors::hasAnchor(AnchorLine::Type sourceAnchorLineType) const
-//{
-//    Internal::InternalNodeState::Pointer statePointer(m_internalNodeState);
-//    InternalNodeAnchors internalNodeAnchors(statePointer);
-//    while (!internalNodeAnchors.hasAnchor(sourceAnchorLineType) &&
-//          statePointer->hasParentState()) {
-//        statePointer = statePointer->parentState();
-//        internalNodeAnchors = InternalNodeAnchors(statePointer);
-//    }
-//
-//    return internalNodeAnchors.hasAnchor(sourceAnchorLineType);
-//}
-//
-//void NodeAnchors::removeAnchor(AnchorLine::Type sourceAnchorLineType)
-//{
-//    if (hasLocalAnchor(sourceAnchorLineType))
-//        m_model->removeAnchor(AnchorLine(nodeState(), sourceAnchorLineType));
-//}
-//
-//void NodeAnchors::removeMargins()
-//{
-//    removeMargin(AnchorLine::Left);
-//    removeMargin(AnchorLine::Right);
-//    removeMargin(AnchorLine::Top);
-//    removeMargin(AnchorLine::Bottom);
-//    removeMargin(AnchorLine::HorizontalCenter);
-//    removeMargin(AnchorLine::VerticalCenter);
-//    removeMargin(AnchorLine::Baseline);
-//}
-//
-//void NodeAnchors::removeAnchors()
-//{
-//    removeAnchor(AnchorLine::Left);
-//    removeAnchor(AnchorLine::Right);
-//    removeAnchor(AnchorLine::Top);
-//    removeAnchor(AnchorLine::Bottom);
-//    removeAnchor(AnchorLine::HorizontalCenter);
-//    removeAnchor(AnchorLine::VerticalCenter);
-//    removeAnchor(AnchorLine::Baseline);
-//}
-//
-//bool NodeAnchors::hasLocalAnchor(AnchorLine::Type sourceAnchorLineType) const
-//{
-//    return InternalNodeAnchors(m_internalNodeState).hasAnchor(sourceAnchorLineType);
-//}
-//
-//bool NodeAnchors::hasLocalAnchors() const
-//{
-//    return hasLocalAnchor(AnchorLine::Top) ||
-//           hasLocalAnchor(AnchorLine::Bottom) ||
-//           hasLocalAnchor(AnchorLine::Left) ||
-//           hasLocalAnchor(AnchorLine::Right) ||
-//           hasLocalAnchor(AnchorLine::VerticalCenter) ||
-//           hasLocalAnchor(AnchorLine::HorizontalCenter) ||
-//           hasLocalAnchor(AnchorLine::Baseline);
-//}
-//
-//bool NodeAnchors::hasAnchors() const
-//{
-//    return hasAnchor(AnchorLine::Top) ||
-//           hasAnchor(AnchorLine::Bottom) ||
-//           hasAnchor(AnchorLine::Left) ||
-//           hasAnchor(AnchorLine::Right) ||
-//           hasAnchor(AnchorLine::VerticalCenter) ||
-//           hasAnchor(AnchorLine::HorizontalCenter) ||
-//           hasAnchor(AnchorLine::Baseline);
-//}
-//
-//void NodeAnchors::setMargin(AnchorLine::Type sourceAnchorLineType, double margin) const
-//{
-//    m_model->setAnchorMargin(AnchorLine(nodeState(), sourceAnchorLineType), margin);
-//}
-//
-//bool NodeAnchors::hasMargin(AnchorLine::Type sourceAnchorLineType) const
-//{
-//    return InternalNodeAnchors(m_internalNodeState).hasMargin(sourceAnchorLineType);
-//}
-//
-//double NodeAnchors::localMargin(AnchorLine::Type sourceAnchorLineType) const
-//{
-//    return InternalNodeAnchors(m_internalNodeState).margin(sourceAnchorLineType);
-//}
-//
-//double NodeAnchors::margin(AnchorLine::Type sourceAnchorLineType) const
-//{
-//    Internal::InternalNodeState::Pointer statePointer(m_internalNodeState);
-//    InternalNodeAnchors internalNodeAnchors(statePointer);
-//    while (!internalNodeAnchors.hasMargin(sourceAnchorLineType) &&
-//          statePointer->hasParentState()) {
-//        statePointer = statePointer->parentState();
-//        internalNodeAnchors = InternalNodeAnchors(statePointer);
-//    }
-//
-//    return internalNodeAnchors.margin(sourceAnchorLineType);
-//}
-//
-//void NodeAnchors::removeMargin(AnchorLine::Type sourceAnchorLineType)
-//{
-//    m_model->removeAnchorMargin(AnchorLine(nodeState(), sourceAnchorLineType));
-//
-//}
-//
-//QDebug operator<<(QDebug debug, const NodeAnchors &anchors)
-//{
-//    debug.nospace() << "NodeAnchors(";
-//    if (anchors.isValid()) {
-//        if (anchors.hasAnchor(AnchorLine::Top))
-//            debug << "top";
-//        if (anchors.hasMargin(AnchorLine::Top))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::Top) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Bottom))
-//            debug << "bottom";
-//        if (anchors.hasMargin(AnchorLine::Bottom))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::Bottom) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Left))
-//            debug << "left";
-//        if (anchors.hasMargin(AnchorLine::Left))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::Left) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Right))
-//            debug << "right";
-//        if (anchors.hasMargin(AnchorLine::Right))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::Right) << ")";
-//        if (anchors.hasAnchor(AnchorLine::VerticalCenter))
-//            debug << "verticalCenter";
-//        if (anchors.hasMargin(AnchorLine::VerticalCenter))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::VerticalCenter) << ")";
-//        if (anchors.hasAnchor(AnchorLine::HorizontalCenter))
-//            debug << "horizontalCenter";
-//        if (anchors.hasMargin(AnchorLine::HorizontalCenter))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::HorizontalCenter) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Baseline))
-//            debug << "baseline";
-//        if (anchors.hasMargin(AnchorLine::Baseline))
-//            debug.nospace() << "(" << anchors.margin(AnchorLine::Baseline) << ")";
-//    } else {
-//        debug.nospace() << "invalid";
-//    }
-//
-//    debug.nospace() << ")";
-//
-//    return debug.space();
-//}
-//
-//QTextStream& operator<<(QTextStream &stream, const NodeAnchors &anchors)
-//{
-//    stream << "NodeAnchors(";
-//    if (anchors.isValid()) {
-//        if (anchors.hasAnchor(AnchorLine::Top))
-//            stream << "top";
-//        if (anchors.hasMargin(AnchorLine::Top))
-//            stream << "(" << anchors.margin(AnchorLine::Top) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Bottom))
-//            stream << "bottom";
-//        if (anchors.hasMargin(AnchorLine::Bottom))
-//            stream << "(" << anchors.margin(AnchorLine::Bottom) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Left))
-//            stream << "left";
-//        if (anchors.hasMargin(AnchorLine::Left))
-//            stream << "(" << anchors.margin(AnchorLine::Left) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Right))
-//            stream << "right";
-//        if (anchors.hasMargin(AnchorLine::Right))
-//            stream << "(" << anchors.margin(AnchorLine::Right) << ")";
-//        if (anchors.hasAnchor(AnchorLine::VerticalCenter))
-//            stream << "verticalCenter";
-//        if (anchors.hasMargin(AnchorLine::VerticalCenter))
-//            stream << "(" << anchors.margin(AnchorLine::VerticalCenter) << ")";
-//        if (anchors.hasAnchor(AnchorLine::HorizontalCenter))
-//            stream << "horizontalCenter";
-//        if (anchors.hasMargin(AnchorLine::HorizontalCenter))
-//            stream << "(" << anchors.margin(AnchorLine::HorizontalCenter) << ")";
-//        if (anchors.hasAnchor(AnchorLine::Baseline))
-//            stream << "baseline";
-//        if (anchors.hasMargin(AnchorLine::Baseline))
-//            stream << "(" << anchors.margin(AnchorLine::Baseline) << ")";
-//    } else {
-//        stream << "invalid";
-//    }
-//
-//    stream << ")";
-//
-//    return stream;
-//}
-//
-//
-//} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp b/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp
deleted file mode 100644
index 23a19b463f885c4c6f4840b50e1bd9789b1abbb6..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "objectpropertybinding.h"
-
-namespace QmlDesigner {
-
-ObjectPropertyBinding::ObjectPropertyBinding()
-{
-}
-
-ObjectPropertyBinding::ObjectPropertyBinding(const ModelNode &node)
-  : m_node(node)
-{
-
-}
-
-ModelNode ObjectPropertyBinding::modelNode() const
-{
-    return m_node;
-}
-
-bool ObjectPropertyBinding::isValid() const
-{
-    return m_node.isValid();
-}
-
-
-} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
deleted file mode 100644
index ec2f2b6cbb205353b08d78f8f02e2d19943e9cd0..0000000000000000000000000000000000000000
--- a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company.  For licensing terms and
-** conditions see http://www.qt.io/terms-conditions.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights.  These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "propertybinding.h"
-#include "invalidpropertyexception.h"
-
-namespace QmlDesigner {
-
-PropertyBinding::PropertyBinding()
-{
-}
-
-PropertyBinding::PropertyBinding(const QString &value):
-        m_value(value)
-{
-}
-
-PropertyBinding::PropertyBinding(const PropertyBinding &other):
-        m_value(other.m_value)
-{
-}
-
-PropertyBinding &PropertyBinding::operator=(const PropertyBinding &other)
-{
-    m_value = other.m_value;
-
-    return *this;
-}
-
-bool PropertyBinding::isValid() const
-{
-    return !m_value.isEmpty();
-}
-
-QString PropertyBinding::value() const
-{
-    return m_value;
-}
-
-
-} // namespace QmlDesigner