diff --git a/src/components/views/settings/tabs/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
index a504953cab..bfcc7b945c 100644
--- a/src/components/views/settings/tabs/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -16,11 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../../languageHandler";
-import MatrixClientPeg from "../../../../MatrixClientPeg";
-import GroupUserSettings from "../../groups/GroupUserSettings";
-import PropTypes from "prop-types";
-import {MatrixClient} from "matrix-js-sdk";
-import { DragDropContext } from 'react-beautiful-dnd';
 import ProfileSettings from "../ProfileSettings";
 import EmailAddresses from "../EmailAddresses";
 import PhoneNumbers from "../PhoneNumbers";
@@ -37,10 +32,6 @@ const Modal = require("../../../../Modal");
 const dis = require("../../../../dispatcher");
 
 export default class GeneralUserSettingsTab extends React.Component {
-    static childContextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
-
     constructor() {
         super();
 
@@ -50,12 +41,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         };
     }
 
-    getChildContext() {
-        return {
-            matrixClient: MatrixClientPeg.get(),
-        };
-    }
-
     _onLanguageChange = (newLanguage) => {
         if (this.state.language === newLanguage) return;
 
@@ -105,16 +90,10 @@ export default class GeneralUserSettingsTab extends React.Component {
     };
 
     _renderProfileSection() {
-        // HACK/TODO: Using DragDropContext feels wrong, but we need it.
         return (
             <div className="mx_SettingsTab_section">
                 <span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
                 <ProfileSettings />
-
-                <span className="mx_SettingsTab_subheading">{_t("Flair")}</span>
-                <DragDropContext>
-                    <GroupUserSettings />
-                </DragDropContext>
             </div>
         );
     }