diff --git a/src/util/component.js b/src/util/component.js
deleted file mode 100644
index f4a087993..000000000
--- a/src/util/component.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import { warn } from './debug'
-import { resolveAsset } from './options'
-import { getAttr, getBindAttr } from './dom'
-
-export const commonTagRE = /^(div|p|span|img|a|b|i|br|ul|ol|li|h1|h2|h3|h4|h5|h6|code|pre|table|th|td|tr|form|label|input|select|option|nav|article|section|header|footer)$/i
-export const reservedTagRE = /^(slot|partial|component)$/i
-
-let isUnknownElement
-if (process.env.NODE_ENV !== 'production') {
-  isUnknownElement = function (el, tag) {
-    if (tag.indexOf('-') > -1) {
-      // http://stackoverflow.com/a/28210364/1070244
-      return (
-        el.constructor === window.HTMLUnknownElement ||
-        el.constructor === window.HTMLElement
-      )
-    } else {
-      return (
-        /HTMLUnknownElement/.test(el.toString()) &&
-        // Chrome returns unknown for several HTML5 elements.
-        // https://code.google.com/p/chromium/issues/detail?id=540526
-        !/^(data|time|rtc|rb)$/.test(tag)
-      )
-    }
-  }
-}
-
-/**
- * Check if an element is a component, if yes return its
- * component id.
- *
- * @param {Element} el
- * @param {Object} options
- * @return {Object|undefined}
- */
-
-export function checkComponentAttr (el, options) {
-  var tag = el.tagName.toLowerCase()
-  var hasAttrs = el.hasAttributes()
-  if (!commonTagRE.test(tag) && !reservedTagRE.test(tag)) {
-    if (resolveAsset(options, 'components', tag)) {
-      return { id: tag }
-    } else {
-      var is = hasAttrs && getIsBinding(el)
-      if (is) {
-        return is
-      } else if (process.env.NODE_ENV !== 'production') {
-        var expectedTag =
-          options._componentNameMap &&
-          options._componentNameMap[tag]
-        if (expectedTag) {
-          warn(
-            'Unknown custom element: <' + tag + '> - ' +
-            'did you mean <' + expectedTag + '>? ' +
-            'HTML is case-insensitive, remember to use kebab-case in templates.'
-          )
-        } else if (isUnknownElement(el, tag)) {
-          warn(
-            'Unknown custom element: <' + tag + '> - did you ' +
-            'register the component correctly? For recursive components, ' +
-            'make sure to provide the "name" option.'
-          )
-        }
-      }
-    }
-  } else if (hasAttrs) {
-    return getIsBinding(el)
-  }
-}
-
-/**
- * Get "is" binding from an element.
- *
- * @param {Element} el
- * @return {Object|undefined}
- */
-
-function getIsBinding (el) {
-  // dynamic syntax
-  var exp = getAttr(el, 'is')
-  if (exp != null) {
-    return { id: exp }
-  } else {
-    exp = getBindAttr(el, 'is')
-    if (exp != null) {
-      return { id: exp, dynamic: true }
-    }
-  }
-}
diff --git a/src/util/index.js b/src/util/index.js
index 7352358f4..e8674473b 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -2,6 +2,5 @@ export * from './lang'
 export * from './env'
 export * from './dom'
 export * from './options'
-export * from './component'
 export * from './debug'
 export { defineReactive } from '../observer/index'
diff --git a/src/util/options.js b/src/util/options.js
index b270a7334..fb55488cf 100644
--- a/src/util/options.js
+++ b/src/util/options.js
@@ -11,7 +11,9 @@ import {
   hyphenate
 } from './lang'
 import { warn } from './debug'
-import { commonTagRE, reservedTagRE } from './component'
+
+export const commonTagRE = /^(div|p|span|img|a|b|i|br|ul|ol|li|h1|h2|h3|h4|h5|h6|code|pre|table|th|td|tr|form|label|input|select|option|nav|article|section|header|footer)$/i
+export const reservedTagRE = /^(slot|partial|component)$/i
 
 /**
  * Option overwriting strategies are functions that handle