diff --git a/src/DOMWrap.jsx b/src/DOMWrap.jsx
index 00a20469..d4dcfcaa 100644
--- a/src/DOMWrap.jsx
+++ b/src/DOMWrap.jsx
@@ -4,6 +4,8 @@ import assign from 'object-assign';
 const DOMWrap = React.createClass({
   propTypes: {
     tag: PropTypes.string,
+    hiddenClassName: PropTypes.string,
+    visible: PropTypes.bool,
   },
 
   getDefaultProps() {
@@ -19,6 +21,9 @@ const DOMWrap = React.createClass({
       props.className += ` ${props.hiddenClassName}`;
     }
     const Tag = props.tag;
+    delete props.tag;
+    delete props.hiddenClassName;
+    delete props.visible;
     return <Tag {...props} />;
   },
 });
diff --git a/src/Divider.jsx b/src/Divider.jsx
index 8c257405..3fac89de 100644
--- a/src/Divider.jsx
+++ b/src/Divider.jsx
@@ -12,7 +12,7 @@ const Divider = React.createClass({
     let className = props.className || '';
     const rootPrefixCls = props.rootPrefixCls;
     className += ' ' + `${rootPrefixCls}-item-divider`;
-    return <li {...props} className={className}/>;
+    return <li className={className} />;
   },
 });
 
diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
index bc6e0c18..8e783c66 100644
--- a/src/MenuItem.jsx
+++ b/src/MenuItem.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { KeyCode } from 'rc-util';
+import KeyCode from 'rc-util/lib/KeyCode';
 import classnames from 'classnames';
 import { noop } from './util';
 
diff --git a/src/MenuMixin.js b/src/MenuMixin.js
index 5905c5e0..68333c4f 100644
--- a/src/MenuMixin.js
+++ b/src/MenuMixin.js
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react';
 import ReactDOM from 'react-dom';
-import { createChainedFunction, KeyCode } from 'rc-util';
+import KeyCode from 'rc-util/lib/KeyCode';
+import createChainedFunction from 'rc-util/lib/createChainedFunction';
 import classnames from 'classnames';
 import scrollIntoView from 'dom-scroll-into-view';
 import assign from 'object-assign';
@@ -255,11 +256,13 @@ const MenuMixin = {
     return (
       // ESLint is not smart enough to know that the type of `children` was checked.
       /* eslint-disable */
-      <DOMWrap style={props.style}
-               tag="ul"
-               hiddenClassName={`${props.prefixCls}-hidden`}
-               visible={props.visible}
-        {...domProps}>
+      <DOMWrap
+        style={props.style}
+        tag="ul"
+        hiddenClassName={`${props.prefixCls}-hidden`}
+        visible={props.visible}
+        {...domProps}
+      >
         {React.Children.map(props.children, this.renderMenuItem)}
       </DOMWrap>
       /*eslint-enable */
diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
index 4960ffbe..11740c2d 100644
--- a/src/SubMenu.jsx
+++ b/src/SubMenu.jsx
@@ -1,6 +1,7 @@
 import SubPopupMenu from './SubPopupMenu';
 import React, { PropTypes } from 'react';
-import { KeyCode, guid } from 'rc-util';
+import KeyCode from 'rc-util/lib/KeyCode';
+import guid from 'rc-util/lib/guid';
 import classnames from 'classnames';
 import { noop } from './util';
 
diff --git a/src/SubMenuStateMixin.jsx b/src/SubMenuStateMixin.jsx
index 70435a97..d6168b2d 100644
--- a/src/SubMenuStateMixin.jsx
+++ b/src/SubMenuStateMixin.jsx
@@ -1,4 +1,6 @@
-import rcUtil, { KeyCode } from 'rc-util';
+import KeyCode from 'rc-util/lib/KeyCode';
+import addEventListener from 'rc-util/lib/Dom/addEventListener';
+import contains from 'rc-util/lib/Dom/contains';
 import ReactDOM from 'react-dom';
 
 export default {
@@ -29,7 +31,7 @@ export default {
   handleDocumentClick(e) {
     // If the click originated from within this component
     // don't do anything.
-    if (rcUtil.Dom.contains(ReactDOM.findDOMNode(this), e.target)) {
+    if (contains(ReactDOM.findDOMNode(this), e.target)) {
       return;
     }
     const props = this.props;
@@ -43,9 +45,9 @@ export default {
 
   bindRootCloseHandlers() {
     if (!this._onDocumentClickListener) {
-      this._onDocumentClickListener = rcUtil.Dom.addEventListener(document,
+      this._onDocumentClickListener = addEventListener(document,
         'click', this.handleDocumentClick);
-      this._onDocumentKeyupListener = rcUtil.Dom.addEventListener(document,
+      this._onDocumentKeyupListener = addEventListener(document,
         'keyup', this.handleDocumentKeyUp);
     }
   },