diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..c4c9543
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/package.json b/package.json
index fd147b7..1ca6529 100644
--- a/package.json
+++ b/package.json
@@ -44,10 +44,6 @@
       ]
     ],
     "plugins": [
-      ["transform-react-remove-prop-types", {
-         "mode": "remove",
-         "removeImport": true
-       }],
       "transform-decorators-legacy",
       "transform-runtime"
     ]
diff --git a/src/modules/BaseLink.js b/src/modules/BaseLink.js
index 3d221b6..6c5365d 100644
--- a/src/modules/BaseLink.js
+++ b/src/modules/BaseLink.js
@@ -1,5 +1,5 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import React, { Component, PropTypes } from 'react';
+// import PropTypes from 'prop-types';
 import { ifNot } from './utils';
 
 // TODO
@@ -113,9 +113,9 @@ BaseLink.propTypes = {
 // Optional
 // these are received if component is wrapped with `withRoute` or `withLink` HOCs
 //===============================================================================
-BaseLink.propTypes[storeName] = PropTypes.object;
-BaseLink.propTypes['route'] = PropTypes.object;
-BaseLink.propTypes['previousRoute'] = PropTypes.object;
-BaseLink.propTypes['isActive'] = PropTypes.bool;
+BaseLink.propTypes[storeName] /* remove-proptypes */ = PropTypes.object;
+BaseLink.propTypes['route'] /* remove-proptypes */ = PropTypes.object;
+BaseLink.propTypes['previousRoute'] /* remove-proptypes */ = PropTypes.object;
+BaseLink.propTypes['isActive'] /* remove-proptypes */ = PropTypes.bool;
 
 export default BaseLink;
diff --git a/src/modules/routeNode.js b/src/modules/routeNode.js
index b66e909..4705ca4 100644
--- a/src/modules/routeNode.js
+++ b/src/modules/routeNode.js
@@ -1,5 +1,5 @@
-import { Component, createElement } from 'react';
-import PropTypes from 'prop-types';
+import { Component, createElement, PropTypes } from 'react';
+// import PropTypes from 'prop-types';
 import { getDisplayName, ifNot } from './utils';
 import { autorun } from 'mobx';
 import { inject } from 'mobx-react';
@@ -59,8 +59,8 @@ function routeNode(nodeName, storeName = 'routerStore') { // route node Name, ro
     RouteNode.displayName = 'RouteNode[' + getDisplayName(RouteSegment) + ']';
 
     // Because @inject creates an extra HOC
-    RouteNode.wrappedComponent.propTypes = {};
-    RouteNode.wrappedComponent.propTypes[storeName] = PropTypes.object.isRequired;
+    RouteNode.wrappedComponent.propTypes /* remove-proptypes */ = {};
+    RouteNode.wrappedComponent.propTypes[storeName] /* remove-proptypes */ = PropTypes.object.isRequired;
 
     return RouteNode;
   };
diff --git a/src/modules/withLink.js b/src/modules/withLink.js
index a72e871..fc638e5 100644
--- a/src/modules/withLink.js
+++ b/src/modules/withLink.js
@@ -1,5 +1,5 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { PropTypes } from 'react';
+// import PropTypes from 'prop-types';
 import BaseLink from './BaseLink';
 import withRoute from './withRoute';
 
diff --git a/src/modules/withRoute.js b/src/modules/withRoute.js
index a7b7e2f..71d3153 100644
--- a/src/modules/withRoute.js
+++ b/src/modules/withRoute.js
@@ -1,5 +1,5 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import React, { Component, PropTypes } from 'react';
+// import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { ifNot, getDisplayName } from './utils';
 
diff --git a/tools/build.js b/tools/build.js
index 000ff03..6197075 100644
--- a/tools/build.js
+++ b/tools/build.js
@@ -22,11 +22,7 @@ promise = promise.then(() => del(['dist/*']));
 
 // Compile source code into a distributable format with Babel
 ['es', 'cjs', 'umd'].forEach((format) => {
-  console.log(Object.assign(pkg.babel, {
-    babelrc: false,
-    exclude: 'node_modules/**',
-    runtimeHelpers: true
-  }));
+
   promise = promise.then(() => rollup.rollup({
     entry: 'src/index.js',
     external: Object.keys(pkg.dependencies),
@@ -37,7 +33,8 @@ promise = promise.then(() => del(['dist/*']));
         runtimeHelpers: true, // because we use transform-runtime plugin (avoid repetition)
       }))
     ]
-  }).then(bundle => bundle.write({
+  })
+  .then(bundle => bundle.write({
     dest: `dist/${format === 'cjs' ? 'index' : `index.${format}`}.js`,
     format,
     sourceMap: true,