diff --git a/lib/collections/ItsLayerCollection.js b/lib/collections/ItsLayerCollection.js
index 1f5805bd5cf1147d3547db4203dbb638f3585401..028fe7b31ccbe5f6de973cc9128c88766b493e1a 100644
--- a/lib/collections/ItsLayerCollection.js
+++ b/lib/collections/ItsLayerCollection.js
@@ -176,5 +176,4 @@ var ItsLayerCollection = (function () {
 })();
 
 nm.ItsLayerCollection = ItsLayerCollection;
-exports.default = ItsLayerCollection;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = ItsLayerCollection;
\ No newline at end of file
diff --git a/lib/collections/LayerLegend.js b/lib/collections/LayerLegend.js
index 44b3602ff30b91cbac9e7b6d7b5d9b3d2c3eb615..a58a622e162323f3396c83aff8378d929840f146 100644
--- a/lib/collections/LayerLegend.js
+++ b/lib/collections/LayerLegend.js
@@ -437,5 +437,4 @@ var LayerLegend = (function () {
 })();
 
 nm.LayerLegend = LayerLegend;
-exports.default = LayerLegend;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerLegend;
\ No newline at end of file
diff --git a/lib/collections/Sliders.js b/lib/collections/Sliders.js
index 6824424a058e4189aadb8a777fc265f2628a249f..c6834fb1dc30d2cd268dde6f01fed3f04639695f 100644
--- a/lib/collections/Sliders.js
+++ b/lib/collections/Sliders.js
@@ -599,5 +599,4 @@ var Sliders = (function () {
 
 nm.Sliders = Sliders;
 window.gv['collections'].Sliders = Sliders;
-exports.default = Sliders;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = Sliders;
\ No newline at end of file
diff --git a/lib/jquery.js b/lib/jquery.js
index c0525455951d79f9fbf3b5553a8c970ec5d14df9..ae1b563e12289ae6a05e46b5596615e02f4042ea 100644
--- a/lib/jquery.js
+++ b/lib/jquery.js
@@ -8,5 +8,4 @@ Object.defineProperty(exports, "__esModule", {
  */
 var $ = require('jquery/dist/jquery.min');
 
-exports.default = $;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = $;
\ No newline at end of file
diff --git a/lib/layers/LayerBase.js b/lib/layers/LayerBase.js
index 3742b68adf19864b0d9040155df8cfb9d2060b7b..15ac7fd76e26602d01da667d590b81da0847ec2c 100644
--- a/lib/layers/LayerBase.js
+++ b/lib/layers/LayerBase.js
@@ -447,5 +447,4 @@ var LayerBase = (function () {
 })();
 
 nm.LayerBase = LayerBase;
-exports.default = LayerBase;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerBase;
\ No newline at end of file
diff --git a/lib/layers/LayerBaseVector.js b/lib/layers/LayerBaseVector.js
index 3ee0b6bf317b29c90bce5e9a45cfaa9de7103d33..ace0a9d7608d8a52ca311a3bc3635939729fd84c 100644
--- a/lib/layers/LayerBaseVector.js
+++ b/lib/layers/LayerBaseVector.js
@@ -339,5 +339,4 @@ var LayerBaseVector = (function (_LayerBase) {
 })(_LayerBase3.default);
 
 nm.LayerBaseVector = LayerBaseVector;
-exports.default = LayerBaseVector;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerBaseVector;
\ No newline at end of file
diff --git a/lib/layers/LayerBaseVectorEsri.js b/lib/layers/LayerBaseVectorEsri.js
index 7f7f368ccb7217e182659c0ef070a3ed03ce31ac..1f9baf0341763c1f8297e36d343f8f490364f99f 100644
--- a/lib/layers/LayerBaseVectorEsri.js
+++ b/lib/layers/LayerBaseVectorEsri.js
@@ -244,5 +244,4 @@ var LayerBaseVectorEsri = (function (_LayerBaseVector) {
 })(_LayerBaseVector3.default);
 
 nm.LayerBaseVectorEsri = LayerBaseVectorEsri;
-exports.default = LayerBaseVectorEsri;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerBaseVectorEsri;
\ No newline at end of file
diff --git a/lib/layers/LayerBaseVectorGeoJson.js b/lib/layers/LayerBaseVectorGeoJson.js
index f001aa7e0d9210d92dbb6a21b2ac56aa5bd9a77a..3a4ef4393554e6c8dbbee097849c8735bfdf037c 100644
--- a/lib/layers/LayerBaseVectorGeoJson.js
+++ b/lib/layers/LayerBaseVectorGeoJson.js
@@ -146,5 +146,4 @@ var LayerBaseVectorGeoJson = (function (_LayerBaseVector) {
 })(_LayerBaseVector3.default);
 
 nm.LayerBaseVectorGeoJson = LayerBaseVectorGeoJson;
-exports.default = LayerBaseVectorGeoJson;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerBaseVectorGeoJson;
\ No newline at end of file
diff --git a/lib/layers/LayerBaseXyzTile.js b/lib/layers/LayerBaseXyzTile.js
index 5e12cfb0cf0490163407dace3049e42d9153d417..d419ad73cd0be5cd3e6ecdf39069af93a5554bd4 100644
--- a/lib/layers/LayerBaseXyzTile.js
+++ b/lib/layers/LayerBaseXyzTile.js
@@ -151,5 +151,4 @@ var LayerBaseXyzTile = (function (_LayerBase) {
 })(_LayerBase3.default);
 
 nm.LayerBaseXyzTile = LayerBaseXyzTile;
-exports.default = LayerBaseXyzTile;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerBaseXyzTile;
\ No newline at end of file
diff --git a/lib/layers/LayerEsriMapServer.js b/lib/layers/LayerEsriMapServer.js
index 08153c19682bbd08af9bcfc3999cf3f5406864aa..5d2e6c74a8febc14e160470a106a88680cccab33 100644
--- a/lib/layers/LayerEsriMapServer.js
+++ b/lib/layers/LayerEsriMapServer.js
@@ -220,5 +220,4 @@ var LayerEsriMapServer = (function (_LayerBase) {
 })(_LayerBase3.default);
 
 nm.LayerEsriMapServer = LayerEsriMapServer;
-exports.default = LayerEsriMapServer;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerEsriMapServer;
\ No newline at end of file
diff --git a/lib/layers/LayerItsInventory.js b/lib/layers/LayerItsInventory.js
index 978a93bef9134f5b1be3ca3519c31155c93467e6..e756f8873ab9b0b90ea6169a394e7db60dd1a4a7 100644
--- a/lib/layers/LayerItsInventory.js
+++ b/lib/layers/LayerItsInventory.js
@@ -406,5 +406,4 @@ var LayerItsInventory = (function (_LayerBaseVectorGeoJs) {
 })(_LayerBaseVectorGeoJson2.default);
 
 nm.LayerItsInventory = LayerItsInventory;
-exports.default = LayerItsInventory;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerItsInventory;
\ No newline at end of file
diff --git a/lib/layers/LayerRealEarthTile.js b/lib/layers/LayerRealEarthTile.js
index d697a03bdab107e57b7a409d112b51634f60f1d9..fd15edfb4c4c57eff5d9fcb158fa546d32dd40d4 100644
--- a/lib/layers/LayerRealEarthTile.js
+++ b/lib/layers/LayerRealEarthTile.js
@@ -87,5 +87,4 @@ var LayerRealEarthTile = (function (_LayerBaseXyzTile) {
 })(_LayerBaseXyzTile3.default);
 
 nm.LayerRealEarthTile = LayerRealEarthTile;
-exports.default = LayerRealEarthTile;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerRealEarthTile;
\ No newline at end of file
diff --git a/lib/layers/LayerRealEarthVector.js b/lib/layers/LayerRealEarthVector.js
index ac7404414c752034d22a7c1edcaef34cc5f3cd2f..d39aedfd71a78570578d1253f217a405dcf61437 100644
--- a/lib/layers/LayerRealEarthVector.js
+++ b/lib/layers/LayerRealEarthVector.js
@@ -93,5 +93,4 @@ var LayerVectorRealEarth = (function (_LayerBaseVectorGeoJs) {
 })(_LayerBaseVectorGeoJson2.default);
 
 nm.LayerVectorRealEarth = LayerVectorRealEarth;
-exports.default = LayerVectorRealEarth;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = LayerVectorRealEarth;
\ No newline at end of file
diff --git a/lib/mixin/RealEarthAnimate.js b/lib/mixin/RealEarthAnimate.js
index 10d592c016b24b32caa73b0febdb90add90c0f5a..d50dcd3f2f9753ed1357f43dff715f76011ba23f 100644
--- a/lib/mixin/RealEarthAnimate.js
+++ b/lib/mixin/RealEarthAnimate.js
@@ -188,5 +188,4 @@ var RealEarthAnimate = (function () {
 })();
 
 nm.RealEarthAnimate = RealEarthAnimate;
-exports.default = RealEarthAnimate;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = RealEarthAnimate;
\ No newline at end of file
diff --git a/lib/mixin/RealEarthAnimateTile.js b/lib/mixin/RealEarthAnimateTile.js
index 60effdb6f4c722121f9a50335a487ee8b3324ae9..16472bf9f8a777f97c246f3ed3f17f7b44057868 100644
--- a/lib/mixin/RealEarthAnimateTile.js
+++ b/lib/mixin/RealEarthAnimateTile.js
@@ -94,5 +94,4 @@ var RealEarthAnimateTile = (function (_RealEarthAnimate) {
 })(_RealEarthAnimate3.default);
 
 nm.RealEarthAnimateTile = RealEarthAnimateTile;
-exports.default = RealEarthAnimateTile;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = RealEarthAnimateTile;
\ No newline at end of file
diff --git a/lib/mixin/RealEarthAnimateVector.js b/lib/mixin/RealEarthAnimateVector.js
index b1084d3c63dd3c86c624730e60886caf1db38f97..8ec81c1141be8966bc52e0b6db613b124974d7b4 100644
--- a/lib/mixin/RealEarthAnimateVector.js
+++ b/lib/mixin/RealEarthAnimateVector.js
@@ -152,5 +152,4 @@ var RealEarthAnimateVector = (function (_RealEarthAnimate) {
 })(_RealEarthAnimate3.default);
 
 nm.RealEarthAnimateVector = RealEarthAnimateVector;
-exports.default = RealEarthAnimateVector;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = RealEarthAnimateVector;
\ No newline at end of file
diff --git a/lib/ol/ol.js b/lib/ol/ol.js
index 5230dce847e9ba600116dcd8b1f50e6654bbd52d..a05bdcbcb1e255a8454d86247b317c69f0c99f13 100644
--- a/lib/ol/ol.js
+++ b/lib/ol/ol.js
@@ -5,5 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 var ol = require('./ol-build');
 
-exports.default = ol;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = ol;
\ No newline at end of file
diff --git a/lib/olHelpers/SortedFeatures.js b/lib/olHelpers/SortedFeatures.js
index 4294b620ad9a0a85f499e00711d09e1b11f745f0..8e3e6f49a26cb128e452fe47bdcc5e992d4c8bf1 100644
--- a/lib/olHelpers/SortedFeatures.js
+++ b/lib/olHelpers/SortedFeatures.js
@@ -132,5 +132,4 @@ var SortedFeatures = (function () {
 })();
 
 nm.SortedFeatures = SortedFeatures;
-exports.default = SortedFeatures;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = SortedFeatures;
\ No newline at end of file
diff --git a/lib/olHelpers/mapInteractionBase.js b/lib/olHelpers/mapInteractionBase.js
index 22d93cc8d466e2c86087dd76bd899c08be631011..63e8c6708b0f08ab9c797abb149ff800b2326cc8 100644
--- a/lib/olHelpers/mapInteractionBase.js
+++ b/lib/olHelpers/mapInteractionBase.js
@@ -108,5 +108,4 @@ var MapInteractionBase = (function () {
 })();
 
 nm.MapInteractionBase = MapInteractionBase;
-exports.default = MapInteractionBase;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = MapInteractionBase;
\ No newline at end of file
diff --git a/lib/olHelpers/mapMove.js b/lib/olHelpers/mapMove.js
index dfd819f2af5e0f05a014403463e13d823513a9c0..dea582457713c8d01766814d00b9fb86138ee06c 100644
--- a/lib/olHelpers/mapMove.js
+++ b/lib/olHelpers/mapMove.js
@@ -16,6 +16,4 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 exports.default = new _mapMoveCls2.default(); /**
                                                * Created by gavorhes on 11/3/2015.
-                                               */
-
-module.exports = exports['default'];
\ No newline at end of file
+                                               */
\ No newline at end of file
diff --git a/lib/olHelpers/mapMoveCls.js b/lib/olHelpers/mapMoveCls.js
index d039c8e29af559d86fac67cd6f37192a59046616..b2a3086df607e07cac14524a53088be798b7f7ad 100644
--- a/lib/olHelpers/mapMoveCls.js
+++ b/lib/olHelpers/mapMoveCls.js
@@ -337,5 +337,4 @@ var MapMoveCls = (function (_MapInteractionBase) {
 })(_mapInteractionBase2.default);
 
 nm.MapMoveCls = MapMoveCls;
-exports.default = MapMoveCls;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = MapMoveCls;
\ No newline at end of file
diff --git a/lib/olHelpers/mapPopup.js b/lib/olHelpers/mapPopup.js
index 54d957ffd002cac260fe37a5b52208fd9d3bb047..dc43be1c855a7ceb62bfea92652869f565fa186a 100644
--- a/lib/olHelpers/mapPopup.js
+++ b/lib/olHelpers/mapPopup.js
@@ -16,6 +16,4 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 exports.default = new _mapPopupCls2.default(); /**
                                                 * Created by gavorhes on 11/3/2015.
-                                                */
-
-module.exports = exports['default'];
\ No newline at end of file
+                                                */
\ No newline at end of file
diff --git a/lib/olHelpers/mapPopupCls.js b/lib/olHelpers/mapPopupCls.js
index 9ef60e89bda792d88ef60339868e2d4b1d16329f..4169f600b727a2f5b52f81d3d559a2529a562404 100644
--- a/lib/olHelpers/mapPopupCls.js
+++ b/lib/olHelpers/mapPopupCls.js
@@ -637,5 +637,4 @@ var MapPopupCls = (function (_MapInteractionBase) {
 })(_mapInteractionBase2.default);
 
 nm.MapPopupCls = MapPopupCls;
-exports.default = MapPopupCls;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = MapPopupCls;
\ No newline at end of file
diff --git a/lib/olHelpers/propertiesZoomStyle.js b/lib/olHelpers/propertiesZoomStyle.js
index fcf5d3f3f137f310348e745261d51b89286980b9..be2c9dd389042ff4acd82a6a5dc0e8a372004e4b 100644
--- a/lib/olHelpers/propertiesZoomStyle.js
+++ b/lib/olHelpers/propertiesZoomStyle.js
@@ -46,5 +46,4 @@ function propertiesZoomStyle(styleFunc) {
 }
 
 nm.propertiesZoomStyle = propertiesZoomStyle;
-exports.default = propertiesZoomStyle;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = propertiesZoomStyle;
\ No newline at end of file
diff --git a/lib/olHelpers/quickMap.js b/lib/olHelpers/quickMap.js
index 8dea49cff377bdcd34a23c410f0358409afe30b6..4da2f5087c76274c3e36031c302342442e55d6bd 100644
--- a/lib/olHelpers/quickMap.js
+++ b/lib/olHelpers/quickMap.js
@@ -52,5 +52,4 @@ function quickMap(options) {
 }
 
 nm.quickMap = quickMap;
-exports.default = quickMap;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = quickMap;
\ No newline at end of file
diff --git a/lib/olHelpers/quickMapBase.js b/lib/olHelpers/quickMapBase.js
index c515f25479f65948a1b4b696a9b6db78ce6257f7..f33ae2cc59d24a1e85ff025981f499eaf87eb8c9 100644
--- a/lib/olHelpers/quickMapBase.js
+++ b/lib/olHelpers/quickMapBase.js
@@ -115,5 +115,4 @@ function quickMapBase(options) {
 }
 
 nm.quickMapBase = quickMapBase;
-exports.default = quickMapBase;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = quickMapBase;
\ No newline at end of file
diff --git a/lib/olHelpers/quickMapMulti.js b/lib/olHelpers/quickMapMulti.js
index ca0462ce751b6ab1f3b07d928d4b138fe0e59369..9276ec62df1a2c06c28eea4a337293d1874fea0e 100644
--- a/lib/olHelpers/quickMapMulti.js
+++ b/lib/olHelpers/quickMapMulti.js
@@ -61,5 +61,4 @@ function quickMapMulti(options) {
 }
 
 nm.quickMapMulti = quickMapMulti;
-exports.default = quickMapMulti;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = quickMapMulti;
\ No newline at end of file
diff --git a/lib/rectangle.js b/lib/rectangle.js
index 6f8c7cfce26b70eb6227de02e8a8957e22fb016b..138d70b6973c221ecf7f7b9885201493a158ab55 100644
--- a/lib/rectangle.js
+++ b/lib/rectangle.js
@@ -102,6 +102,4 @@ exports.default = Rectangle;
 //
 //// We export the Rectangle class so it can
 //// be require()'d in other files.
-//module.exports = Rectangle;
-
-module.exports = exports['default'];
\ No newline at end of file
+//module.exports = Rectangle;
\ No newline at end of file
diff --git a/lib/util/formatString.js b/lib/util/formatString.js
index e7abfc4062335595d891db5c71ca091ee0ee8df7..524d5f80127b1da271a02f4d1aa6b5577995e63b 100644
--- a/lib/util/formatString.js
+++ b/lib/util/formatString.js
@@ -40,5 +40,4 @@ if (!String.prototype.format) {
     };
 }
 
-exports.default = undefined;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = undefined;
\ No newline at end of file
diff --git a/lib/util/makeGuid.js b/lib/util/makeGuid.js
index ee2e35ad41c1a1881e9bd31755c73bb88ebb0a20..8ba66e8c09e0b4728ab38a42e0c00e652a9111f3 100644
--- a/lib/util/makeGuid.js
+++ b/lib/util/makeGuid.js
@@ -29,5 +29,4 @@ function makeGuid() {
   });
 }
 nm.makeGuid = makeGuid;
-exports.default = makeGuid;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = makeGuid;
\ No newline at end of file
diff --git a/lib/util/provide.js b/lib/util/provide.js
index 0029bd451fddfe3d9f2cb9a6ef9e0dc2e72707a3..1b1e19c86cf402df01f9ed6bd4abe249a63fefe4 100644
--- a/lib/util/provide.js
+++ b/lib/util/provide.js
@@ -38,5 +38,4 @@ function provide(namespace) {
 provide('util');
 window.gv.util.provide = provide;
 
-exports.default = provide;
-module.exports = exports['default'];
\ No newline at end of file
+exports.default = provide;
\ No newline at end of file
diff --git a/package.json b/package.json
index a50eaef49c46e4218e0af7d465f068027ae4738a..687ea641de96e689dfab316964eb3e31b02e9216 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "ol": "node node_modules/openlayers/tasks/build.js src/ol/ol-config.json src/ol/ol-build.js",
     "lint": "eslint src/**/*.js",
     "jsdoc": "jsdoc -r -d doc src",
-    "src2lib": "babel src --out-dir lib --presets es2015 --plugins add-module-exports --ignore ol-build.js & COPY /Y src\\ol\\ol-build.js lib\\ol\\ol-build.js"
+    "src2lib": "babel src --out-dir lib --presets es2015 --ignore ol-build.js & COPY /Y src\\ol\\ol-build.js lib\\ol\\ol-build.js"
   },
   "author": "TOPS Lab",
   "license": "ISC",