diff --git a/client/modules/User/pages/EmailVerificationView.jsx b/client/modules/User/pages/EmailVerificationView.jsx
index 4b860b9a..c127ecd1 100644
--- a/client/modules/User/pages/EmailVerificationView.jsx
+++ b/client/modules/User/pages/EmailVerificationView.jsx
@@ -22,9 +22,6 @@ class EmailVerificationView extends React.Component {
     this.closeLoginPage = this.closeLoginPage.bind(this);
     this.gotoHomePage = this.gotoHomePage.bind(this);
 
-    this.state = {
-      error: null,
-    };
   }
 
   componentWillMount() {
diff --git a/server/controllers/aws.controller.js b/server/controllers/aws.controller.js
index a5e507e8..f7d544da 100644
--- a/server/controllers/aws.controller.js
+++ b/server/controllers/aws.controller.js
@@ -88,7 +88,7 @@ export function signS3(req, res) {
 }
 
 export function copyObjectInS3(req, res) {
-  const url = req.body.url;
+  const { url } = req.body;
   const objectKey = getObjectKey(url);
   const fileExtension = getExtension(objectKey);
   const newFilename = uuid.v4() + fileExtension;
@@ -109,7 +109,7 @@ export function copyObjectInS3(req, res) {
 }
 
 export function listObjectsInS3ForUser(req, res) {
-  const username = req.params.username;
+const { username } = req.params;
   findUserByUsername(username, (user) => {
     const userId = user.id;
     const params = {
diff --git a/server/controllers/embed.controller.js b/server/controllers/embed.controller.js
index 447527ff..8b56455a 100644
--- a/server/controllers/embed.controller.js
+++ b/server/controllers/embed.controller.js
@@ -15,7 +15,7 @@ export function serveProject(req, res) {
         return;
       }
       // TODO this does not parse html
-      const files = project.files;
+      const { files } = project;
       const htmlFile = files.find(file => file.name.match(/\.html$/i)).content;
       const filesToInject = files.filter(file => file.name.match(/\.(js|css)$/i));
       injectMediaUrls(filesToInject, files, req.params.project_id);
diff --git a/server/controllers/project.controller.js b/server/controllers/project.controller.js
index dba09b73..88b990a3 100644
--- a/server/controllers/project.controller.js
+++ b/server/controllers/project.controller.js
@@ -249,7 +249,7 @@ function bundleExternalLibs(project, zip, callback) {
   function resolveScriptTagSrc(scriptTag, document) {
     const path = scriptTag.src.split('/');
     const filename = path[path.length - 1];
-    const src = scriptTag.src;
+    const { src } = scriptTag;
 
     if (!isUrl(src)) {
       numScriptsResolved += 1;
@@ -286,7 +286,7 @@ function buildZip(project, req, res) {
   const zip = archiver('zip');
   const rootFile = project.files.find(file => file.name === 'root');
   const numFiles = project.files.filter(file => file.fileType !== 'folder').length;
-  const files = project.files;
+  const { files } = project;
   let numCompletedFiles = 0;
 
   zip.on('error', (err) => {
diff --git a/server/models/project.js b/server/models/project.js
index c02c99c4..ac70fc5b 100644
--- a/server/models/project.js
+++ b/server/models/project.js
@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 import shortid from 'shortid';
 import slugify from 'slugify';
 
-const Schema = mongoose.Schema;
+const { Schema } = mongoose;
 
 const fileSchema = new Schema({
   name: { type: String, default: 'sketch.js' },
diff --git a/server/models/user.js b/server/models/user.js
index 5ddaf2f9..168a71ca 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -8,7 +8,7 @@ const EmailConfirmationStates = {
   Resent: 'resent',
 };
 
-const Schema = mongoose.Schema;
+const { Schema } = mongoose;
 
 const userSchema = new Schema({
   name: { type: String, default: '' },