diff --git a/.eslintrc.json b/.eslintrc.json
index 8e75752..4df1ee5 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,18 +5,13 @@
     "jest": true
   },
   "rules": {
+    "react/sort-comp": "off",
     "class-methods-use-this": "off",
-
     "arrow-parens": "off",
-
     "import/prefer-default-export": "off",
-
     "react/prefer-stateless-function": "off",
-
     "react/prop-types": "off",
-
     "jsx-a11y/anchor-is-valid": "off",
-
     "react/jsx-filename-extension": [
       1,
       {
diff --git a/package.json b/package.json
index 64f933f..22c2c17 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "react-chartjs-2": "^2.7.2",
     "react-dom": "^16.2.0",
     "react-redux": "^5.0.7",
-    "react-responsive": "^4.1.0",
     "react-router-dom": "^4.2.2",
     "redux": "^4.0.0"
   },
diff --git a/src/components/shared/DisplayOn.js b/src/components/shared/DisplayOn.js
deleted file mode 100644
index 7b18fed..0000000
--- a/src/components/shared/DisplayOn.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import MediaQuery from 'react-responsive';
-
-/**
- * Media query for both PC and Mobile devices.
- * Usage:
- *  <DisplayOn device="mobile">Display on mobile</DisplayOn>
- *  <DisplayOn device="PC">Display on PC</DisplayOn>
- */
-const DisplayOn = ({ device, children }) => {
-  if (device === 'mobile') {
-    return (
-      <MediaQuery query="(max-device-width: 767px)">
-        {children}
-      </MediaQuery>
-    );
-  }
-
-  if (device === 'PC') {
-    return (
-      <MediaQuery query="(min-device-width: 768px)">
-        {children}
-      </MediaQuery>
-    );
-  }
-
-  throw new Error('Only mobile or PC devices are allowed');
-};
-
-export default DisplayOn;
diff --git a/yarn.lock b/yarn.lock
index ce6e58c..97e5930 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1953,10 +1953,6 @@ css-loader@0.28.7:
     postcss-value-parser "^3.3.0"
     source-list-map "^2.0.0"
 
-css-mediaquery@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/css-mediaquery/-/css-mediaquery-0.1.2.tgz#6a2c37344928618631c54bd33cedd301da18bea0"
-
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
@@ -3741,7 +3737,7 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-hyphenate-style-name@^1.0.0, hyphenate-style-name@^1.0.2:
+hyphenate-style-name@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
@@ -5299,12 +5295,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-matchmediaquery@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/matchmediaquery/-/matchmediaquery-0.2.1.tgz#223c7005793de03e47ce92b13285a72c44ada2cf"
-  dependencies:
-    css-mediaquery "^0.1.2"
-
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@@ -6741,14 +6731,6 @@ react-redux@^5.0.7:
     loose-envify "^1.1.0"
     prop-types "^15.6.0"
 
-react-responsive@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/react-responsive/-/react-responsive-4.1.0.tgz#01d129a35729c8f0373e79871cc8d5ecf6e22765"
-  dependencies:
-    hyphenate-style-name "^1.0.0"
-    matchmediaquery "^0.2.1"
-    prop-types "^15.6.1"
-
 react-router-dom@^4.2.2:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"