diff --git a/packages/core-js/jsconfig.json b/packages/core-js/jsconfig.json
index d7ce2a30..13231242 100644
--- a/packages/core-js/jsconfig.json
+++ b/packages/core-js/jsconfig.json
@@ -2,9 +2,6 @@
   "compilerOptions": {
     "baseUrl": ".",
     "module": "commonjs",
-    "paths": {
-      "@libraries/*": ["../../libraries/*"]
-    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/packages/core-js/src/Functions.js b/packages/core-js/src/Functions.js
deleted file mode 100644
index db1c1033..00000000
--- a/packages/core-js/src/Functions.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Function: $defined
- Returns true if the passed in value/object is defined, that means is not null or undefined.
-
- Arguments:
- obj - object to inspect
- */
-
-export const $defined = function (obj) {
-    return obj != undefined;
-};
-
-export const $assert = function (assert, message) {
-    if (!$defined(assert) || !assert) {
-        logStackTrace();
-        console.log(message);
-        throw new Error(message);
-    }
-};
-
-export const sign = function (value) {
-    return value >= 0 ? 1 : -1;
-};
-
-export function logStackTrace(exception) {
-    if (!$defined(exception)) {
-        try {
-            throw Error('Unexpected Exception');
-        } catch (e) {
-            exception = e;
-        }
-    }
-    var result = '';
-    if (exception.stack) {
-        //Firefox  and Chrome...
-        result = exception.stack;
-    } else if (window.opera && exception.message) {
-        //Opera
-        result = exception.message;
-    } else {
-        //IE and Safari
-        result = exception.sourceURL + ': ' + exception.line + '\n\n';
-
-        var currentFunction = arguments.callee.caller;
-        while (currentFunction) {
-            var fn = currentFunction.toString();
-            result = result + '\n' + fn;
-            currentFunction = currentFunction.caller;
-        }
-    }
-    window.errorStack = result;
-    return result;
-}
diff --git a/packages/core-js/src/core.js b/packages/core-js/src/core.js
deleted file mode 100644
index 3cce5665..00000000
--- a/packages/core-js/src/core.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as Functions from './Functions';
-import * as Util from './Utils';
-
-export const Function = Functions;
-export const Utils = Util;
-
-function coreJs() {
-    global.core = {
-        Function,
-        Utils
-    };
-    Math.sign = Function.sign;
-    global.$assert = Function.$assert;
-    global.$defined = Function.$defined;
-    return global.core;
-}
-
-export default coreJs;
diff --git a/packages/core-js/src/Utils.js b/packages/core-js/src/index.js
similarity index 59%
rename from packages/core-js/src/Utils.js
rename to packages/core-js/src/index.js
index f0723ca1..651c773b 100644
--- a/packages/core-js/src/Utils.js
+++ b/packages/core-js/src/index.js
@@ -52,3 +52,57 @@ export const createDocument = function () {
 
     return doc;
 };
+
+/*
+ Function: $defined
+ Returns true if the passed in value/object is defined, that means is not null or undefined.
+
+ Arguments:
+ obj - object to inspect
+ */
+
+ export const $defined = function (obj) {
+    return obj != undefined;
+};
+
+export const $assert = function (assert, message) {
+    if (!$defined(assert) || !assert) {
+        logStackTrace();
+        console.log(message);
+        throw new Error(message);
+    }
+};
+
+export const sign = function (value) {
+    return value >= 0 ? 1 : -1;
+};
+
+export function logStackTrace(exception) {
+    if (!$defined(exception)) {
+        try {
+            throw Error('Unexpected Exception');
+        } catch (e) {
+            exception = e;
+        }
+    }
+    var result = '';
+    if (exception.stack) {
+        //Firefox  and Chrome...
+        result = exception.stack;
+    } else if (window.opera && exception.message) {
+        //Opera
+        result = exception.message;
+    } else {
+        //IE and Safari
+        result = exception.sourceURL + ': ' + exception.line + '\n\n';
+
+        var currentFunction = arguments.callee.caller;
+        while (currentFunction) {
+            var fn = currentFunction.toString();
+            result = result + '\n' + fn;
+            currentFunction = currentFunction.caller;
+        }
+    }
+    window.errorStack = result;
+    return result;
+}
diff --git a/packages/core-js/webpack.common.js b/packages/core-js/webpack.common.js
index 7f09214a..1a31d81f 100644
--- a/packages/core-js/webpack.common.js
+++ b/packages/core-js/webpack.common.js
@@ -2,7 +2,6 @@ const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
 module.exports = {
-    entry: './src/core.js',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'core.js',
@@ -19,16 +18,11 @@ module.exports = {
                 test: /.js$/,
                 exclude: [
                     /node_modules/,
-                    path.resolve(__dirname, '../../libraries/mootools-core-1.4.5'),
-                    path.resolve(__dirname, '../../libraries/underscore-min'),
                 ]
             },
         ],
     },
     resolve: {
-        alias: {
-            '@libraries': path.resolve(__dirname, '../../libraries/'),
-        },
         extensions: ['.js'],
     },
     plugins: [new CleanWebpackPlugin()],
diff --git a/packages/web2d/src/components/Font.js b/packages/web2d/src/components/Font.js
index f249907b..97324f55 100644
--- a/packages/web2d/src/components/Font.js
+++ b/packages/web2d/src/components/Font.js
@@ -21,11 +21,7 @@ import TransformUtil from './peer/utils/TransformUtils';
 
 class Font {
   constructor(fontFamily, textPeer) {
-    // eslint-disable-next-line no-unused-vars
-    const tools = Toolkit; // Used as of the defined object.
-    const font = `tools.create${fontFamily}Font();`;
-    // eslint-disable-next-line no-eval
-    this.peer = eval(font);
+    this.peer = Toolkit[`create${fontFamily}Font`]();
     this._textPeer = textPeer;
   }
 
diff --git a/packages/web2d/src/components/Rect.js b/packages/web2d/src/components/Rect.js
index fd9b9981..463570c5 100644
--- a/packages/web2d/src/components/Rect.js
+++ b/packages/web2d/src/components/Rect.js
@@ -48,7 +48,8 @@ class Rect extends ElementClass {
     super(peer, defaultAttributes);
   }
 
-  static getType() {
+  // eslint-disable-next-line class-methods-use-this
+  getType() {
     return 'Rect';
   }
 
diff --git a/packages/web2d/src/components/Text.js b/packages/web2d/src/components/Text.js
index 3371563d..bfadc459 100644
--- a/packages/web2d/src/components/Text.js
+++ b/packages/web2d/src/components/Text.js
@@ -27,7 +27,8 @@ class Text extends ElementClass {
     super(peer, attributes);
   }
 
-  static getType() {
+  // eslint-disable-next-line class-methods-use-this
+  getType() {
     return 'Text';
   }
 
diff --git a/packages/web2d/src/components/Toolkit.js b/packages/web2d/src/components/Toolkit.js
index 8c50a844..067ca6c7 100644
--- a/packages/web2d/src/components/Toolkit.js
+++ b/packages/web2d/src/components/Toolkit.js
@@ -75,7 +75,7 @@ class Toolkit {
     return new RectPeer(arc);
   }
 
-  static reateArialFont() {
+  static createArialFont() {
     return new ArialFont();
   }