diff --git a/frontend/src/metabase/questions/components/EmojiIcon.jsx b/frontend/src/metabase/questions/components/EmojiIcon.jsx
deleted file mode 100644
index 3256aeec840336c7d33df5b5d4fc09607ee8cc1d..0000000000000000000000000000000000000000
--- a/frontend/src/metabase/questions/components/EmojiIcon.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* eslint "react/prop-types": "warn" */
-import React, { Component, PropTypes } from "react";
-
-import { emoji } from "metabase/lib/emoji";
-
-const EmojiIcon = ({ size = 18, style, className, name }) =>
-    <span className={className} style={{ width: size, height: size, ...style }}>
-        {emoji[name].react}
-    </span>
-
-EmojiIcon.propTypes = {
-    className:  PropTypes.string,
-    style:      PropTypes.object,
-    size:       PropTypes.number,
-    name:       PropTypes.string.isRequired,
-};
-
-export default EmojiIcon;
diff --git a/frontend/src/metabase/questions/components/Labels.jsx b/frontend/src/metabase/questions/components/Labels.jsx
index 6b0e8431a7a00df73a59ced7af5767b14e08802a..e14b3d8bc08b26f7b72d28aa33af9204f3dba412 100644
--- a/frontend/src/metabase/questions/components/Labels.jsx
+++ b/frontend/src/metabase/questions/components/Labels.jsx
@@ -4,7 +4,7 @@ import { Link } from "react-router";
 import S from "./Labels.css";
 import color from 'color'
 
-import EmojiIcon from "./EmojiIcon.jsx"
+import EmojiIcon from "metabase/components/EmojiIcon.jsx"
 
 import cx from "classnames";
 
diff --git a/frontend/src/metabase/reference/components/Field.jsx b/frontend/src/metabase/reference/components/Field.jsx
index 144e72f4e97c5a464ad7819200da7e75e1b0af27..69ce9348fe378f6d8913a7865e3b7272f7a3282d 100644
--- a/frontend/src/metabase/reference/components/Field.jsx
+++ b/frontend/src/metabase/reference/components/Field.jsx
@@ -105,10 +105,10 @@ Field.propTypes = {
     field: PropTypes.object.isRequired,
     foreignKeys: PropTypes.object.isRequired,
     url: PropTypes.string.isRequired,
-    placeholder:        PropTypes.string,
-    icon:               PropTypes.string,
-    isEditing:          PropTypes.bool,
-    formField:              PropTypes.object
+    placeholder: PropTypes.string,
+    icon: PropTypes.string,
+    isEditing: PropTypes.bool,
+    formField: PropTypes.object
 };
 
 export default pure(Field);
diff --git a/package.json b/package.json
index 03337163f5c1f4f1d761e7cab698577ffe4305c2..f8053b754b6c232a6329e84d2cedc426d2fb350a 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "react-ansi-style": "^1.0.0",
     "react-dom": "^0.14.7",
     "react-draggable": "^1.1.3",
-    "react-manhattan": "^0.2.2",
     "react-onclickout": "^2.0.4",
     "react-redux": "^4.4.0",
     "react-resizable": "^1.0.1",
diff --git a/webpack.config.js b/webpack.config.js
index 64581b7ad6b149e663bbcfd0a7e196acc623d5bc..866a7a869ccac9c7131e8633a77cbac5cbc38017 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,7 +8,7 @@ var CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var UnusedFilesWebpackPlugin = require("unused-files-webpack-plugin").default;
-// var FlowStatusWebpackPlugin = require('flow-status-webpack-plugin');
+var FlowStatusWebpackPlugin = require('flow-status-webpack-plugin');
 
 var _ = require('underscore');
 var glob = require('glob');