diff --git a/src/GroupInvite.js b/src/GroupInvite.js
index e977d2fba0..64b0b255e5 100644
--- a/src/GroupInvite.js
+++ b/src/GroupInvite.js
@@ -14,12 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
 import Modal from './Modal';
 import sdk from './';
 import MultiInviter from './utils/MultiInviter';
 import { _t } from './languageHandler';
-import Promise from 'bluebird';
 
 export function showGroupInviteDialog(groupId) {
     const UserPickerDialog = sdk.getComponent("dialogs.UserPickerDialog");
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index e7e1e82b82..dac0071155 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -362,7 +362,7 @@ export default React.createClass({
                         description: _t("Unable to leave room"),
                     });
                 });
-            }
+            },
         });
     },
 
@@ -500,7 +500,7 @@ export default React.createClass({
             let nameNode;
             let shortDescNode;
             let roomBody;
-            let rightButtons = [];
+            const rightButtons = [];
             const headerClasses = {
                 mx_GroupView_header: true,
             };
@@ -548,13 +548,13 @@ export default React.createClass({
                         onClick={this._onSaveClick} key="_saveButton"
                     >
                         {_t('Save')}
-                    </AccessibleButton>
+                    </AccessibleButton>,
                 );
                 rightButtons.push(
                     <AccessibleButton className='mx_GroupView_textButton' onClick={this._onCancelClick} key="_cancelButton">
                         <img src="img/cancel.svg" className='mx_filterFlipColor'
                             width="18" height="18" alt={_t("Cancel")}/>
-                    </AccessibleButton>
+                    </AccessibleButton>,
                 );
                 roomBody = <div>
                     <textarea className="mx_GroupView_editLongDesc" value={this.state.profileForm.long_description}
@@ -596,7 +596,7 @@ export default React.createClass({
                         onClick={this._onEditClick} title={_t("Edit Group")} key="_editButton"
                     >
                         <TintableSvg src="img/icons-settings-room.svg" width="16" height="16"/>
-                    </AccessibleButton>
+                    </AccessibleButton>,
                 );
                 if (this.props.collapsedRhs) {
                     rightButtons.push(
@@ -604,7 +604,7 @@ export default React.createClass({
                             onClick={this._onShowRhsClick} title={ _t('Show panel') } key="_maximiseButton"
                         >
                             <TintableSvg src="img/maximise.svg" width="10" height="16"/>
-                        </AccessibleButton>
+                        </AccessibleButton>,
                     );
                 }
 
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index c4e4f18ee0..a010bcdd15 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -105,7 +105,7 @@ export default React.createClass({
             userId = this.props.member.userId;
         } else {
             // we don't get this info from the API yet
-            avatar = <BaseAvatar name={this.props.groupMember.userId} width={36} height={36} />
+            avatar = <BaseAvatar name={this.props.groupMember.userId} width={36} height={36} />;
             name = this.props.groupMember.userId;
             userId = this.props.groupMember.userId;
         }
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index e1351de069..b1578888bc 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -18,8 +18,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
-import withMatrixClient from '../../../wrappers/withMatrixClient';
-import Matrix from "matrix-js-sdk";
 import AccessibleButton from '../elements/AccessibleButton';
 
 export default React.createClass({
@@ -68,5 +66,5 @@ export default React.createClass({
                 </div>
             </AccessibleButton>
         );
-    }
+    },
 });
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 7083dff657..5cb9f9f7b4 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -16,16 +16,11 @@ limitations under the License.
 
 import PropTypes from 'prop-types';
 import React from 'react';
-import classNames from 'classnames';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import createRoom from '../../../createRoom';
-import DMRoomMap from '../../../utils/DMRoomMap';
-import Unread from '../../../Unread';
 import { GroupMemberType } from '../../../groups';
-import { findReadReceiptFromUserId } from '../../../utils/Receipt';
 import { groupMemberFromApiObject } from '../../../groups';
 import withMatrixClient from '../../../wrappers/withMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -46,7 +41,7 @@ module.exports = withMatrixClient(React.createClass({
             fetching: false,
             removingUser: false,
             members: null,
-        }
+        };
     },
 
     componentWillMount: function() {
@@ -81,7 +76,7 @@ module.exports = withMatrixClient(React.createClass({
                 this.props.matrixClient.removeUserFromGroup(this.props.groupId, this.props.member.userId).then(() => {
                     dis.dispatch({
                         action: "view_user",
-                        member: null
+                        member: null,
                     });
                 }).catch((e) => {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -99,7 +94,7 @@ module.exports = withMatrixClient(React.createClass({
     _onCancel: function(e) {
         dis.dispatch({
             action: "view_user",
-            member: null
+            member: null,
         });
     },
 
@@ -124,7 +119,8 @@ module.exports = withMatrixClient(React.createClass({
             }
         }
 
-        let kickButton, adminButton;
+        let kickButton;
+        let adminButton;
 
         if (targetIsInGroup) {
             kickButton = (
@@ -182,5 +178,5 @@ module.exports = withMatrixClient(React.createClass({
                 </GeminiScrollbar>
             </div>
         );
-    }
+    },
 }));
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 4c2cc03a5c..ae726d4d88 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -145,5 +145,5 @@ export default withMatrixClient(React.createClass({
                 </GeminiScrollbar>
             </div>
         );
-    }
+    },
 }));
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 35dbd8b531..bccb954607 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -18,10 +18,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
-import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
 import withMatrixClient from '../../../wrappers/withMatrixClient';
-import Matrix from "matrix-js-sdk";
 
 export default withMatrixClient(React.createClass({
     displayName: 'GroupMemberTile',
@@ -60,5 +58,5 @@ export default withMatrixClient(React.createClass({
                 name={name} powerLevel={0} suppressOnHover={true}
             />
         );
-    }
+    },
 }));
diff --git a/src/groups.js b/src/groups.js
index 9627fcc1cd..06627a4ae3 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -23,5 +23,5 @@ export const GroupMemberType = PropTypes.shape({
 export function groupMemberFromApiObject(apiObject) {
     return {
         userId: apiObject.user_id,
-    }
+    };
 }