diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 484077876a..b9e22b84d3 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,4 +1,4 @@
-name: CI job - new
+name: CI job
 
 on:
   push:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 05888ce9f3..0000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-name: CI job
-
-on:
-  push:
-    branches-ignore:
-      - crowdin
-  pull_request:
-    branches-ignore:
-      - crowdin
-
-jobs:
-  linux_tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
-        with:
-          version: 18
-          cache: npm
-      - run: npm ci
-      - run: npm test
-
-  linux_build:
-    runs-on: ubuntu-latest
-    needs: linux_tests
-    steps:
-      - uses: actions/checkout@master
-      - name: get-npm-version
-        id: package-version
-        uses: pchynoweth/action-get-npm-version@1.1.1
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
-        with:
-          version: 18
-          cache: npm
-      - run: npm ci
-      - run: npm run build:linux
-        shell: bash
-        env:
-          VERSION: ${{ steps.package-version.outputs.version}}
-
-  mac_tests:
-    runs-on: macos-11
-    timeout-minutes: 30
-
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
-        with:
-          version: 18
-          cache: npm
-      - run: npm ci
-      - run: npm test
-
-  mac_build:
-    runs-on: macos-11
-    needs: mac_tests
-    steps:
-      - uses: actions/checkout@master
-      - name: get-npm-version
-        id: package-version
-        uses: pchynoweth/action-get-npm-version@1.1.1
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
-        with:
-          version: 18
-          cache: npm
-      - run: npm ci
-      - run: npm run build:macos
-        shell: bash
-        env:
-          VERSION: ${{ steps.package-version.outputs.version}}
-
-  windows_tests:
-    runs-on: windows-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
-        with:
-          version: 18
-          cache: npm
-      - name: add git binaries to PATH
-        run: |
-          echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "C:\Program Files\Git\mingw64\libexec\git-core" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - run: npm ci
-      - run: npm test
-
-  windows_build:
-    runs-on: windows-latest
-    needs: windows_tests
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@master
-      - name: get-npm-version
-        id: package-version
-        uses: pchynoweth/action-get-npm-version@1.1.1
-      - name: Use Node.js 18
-        uses: actions/setup-node@master
-        with:
-          version: 18
-          cache: npm
-      - name: add git binaries to PATH
-        run: |
-          echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "C:\Program Files\Git\mingw64\libexec\git-core" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - run: npm ci
-      - run: npm run build:windows
-        shell: bash
-        env:
-          VERSION: ${{ steps.package-version.outputs.version}}
diff --git a/packages/ui/lib/components/LibraryListTypeToggle/index.js b/packages/ui/lib/components/LibraryListTypeToggle/index.js
index b4ecabf69b..1487997c1c 100644
--- a/packages/ui/lib/components/LibraryListTypeToggle/index.js
+++ b/packages/ui/lib/components/LibraryListTypeToggle/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Button } from 'semantic-ui-react';
-import { withHandlers } from 'recompose';
 
 import styles from './styles.scss';
 
@@ -13,44 +12,45 @@ export const LIST_TYPE = Object.freeze({
 });
 
 const LibraryListTypeToggle = ({
-  toggleSimpleList,
-  toggleAlbumGrid,
-  // toggleAlbumList,
-  toggleFolderTree,
+  toggleListType,
   listType
-}) => (
-  <Button.Group className={styles.library_list_type_toggle}>
-    <Button
-      data-testid='library-list-type-toggle-simple-list'
-      inverted
-      icon='unordered list'
-      onClick={toggleSimpleList}
-      active={listType === LIST_TYPE.SIMPLE_LIST}
-    />
-    <Button
-      data-testid='library-list-type-toggle-album-grid'
-      inverted
-      icon='th'
-      onClick={toggleAlbumGrid}
-      active={listType === LIST_TYPE.ALBUM_GRID}
-    />
-    {
-      // TODO: To be developed and re-enabled later
-      // <Button
-      //   inverted icon='bars' onClick={toggleAlbumList}
-      //   active={listType === LIST_TYPE.ALBUM_LIST}
-      //
-      // />
-    }
-    <Button
-      data-testid='library-list-type-toggle-folder-tree'
-      inverted
-      icon='folder'
-      onClick={toggleFolderTree}
-      active={listType === LIST_TYPE.FOLDER_TREE}
-    />
-  </Button.Group>
-);
+}) => {
+  const toggleSimpleList = () => toggleListType(LIST_TYPE.SIMPLE_LIST);
+  const toggleAlbumGrid = () => toggleListType(LIST_TYPE.ALBUM_GRID);
+  const toggleAlbumList = () => toggleListType(LIST_TYPE.ALBUM_LIST);
+  const toggleFolderTree = () => toggleListType(LIST_TYPE.FOLDER_TREE);
+
+  return (
+    <Button.Group className={styles.library_list_type_toggle}>
+      <Button
+        data-testid='library-list-type-toggle-simple-list'
+        inverted
+        icon='unordered list'
+        onClick={toggleSimpleList}
+        active={listType === LIST_TYPE.SIMPLE_LIST} />
+      <Button
+        data-testid='library-list-type-toggle-album-grid'
+        inverted
+        icon='th'
+        onClick={toggleAlbumGrid}
+        active={listType === LIST_TYPE.ALBUM_GRID} />
+      {
+        // TODO: To be developed and re-enabled later
+        // <Button
+        //   inverted icon='bars' onClick={toggleAlbumList}
+        //   active={listType === LIST_TYPE.ALBUM_LIST}
+        //
+        // />
+      }
+      <Button
+        data-testid='library-list-type-toggle-folder-tree'
+        inverted
+        icon='folder'
+        onClick={toggleFolderTree}
+        active={listType === LIST_TYPE.FOLDER_TREE} />
+    </Button.Group>
+  );
+};
 
 
 LibraryListTypeToggle.propTypes = {
@@ -59,9 +59,4 @@ LibraryListTypeToggle.propTypes = {
   listType: PropTypes.string
 };
 
-export default withHandlers({
-  toggleSimpleList: ({ toggleListType }) => () => toggleListType(LIST_TYPE.SIMPLE_LIST),
-  toggleAlbumGrid: ({ toggleListType }) => () => toggleListType(LIST_TYPE.ALBUM_GRID),
-  toggleAlbumList: ({ toggleListType }) => () => toggleListType(LIST_TYPE.ALBUM_LIST),
-  toggleFolderTree: ({ toggleListType }) => () => toggleListType(LIST_TYPE.FOLDER_TREE)
-})(LibraryListTypeToggle);
+export default LibraryListTypeToggle;
diff --git a/packages/ui/lib/components/UserPluginsItem/index.js b/packages/ui/lib/components/UserPluginsItem/index.js
index bf0a96519d..5b87e0d394 100644
--- a/packages/ui/lib/components/UserPluginsItem/index.js
+++ b/packages/ui/lib/components/UserPluginsItem/index.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { Button, Icon } from 'semantic-ui-react';
-import { compose, withHandlers } from 'recompose';
 
 import Loader from '../Loader';
 import common from '../../common.scss';
@@ -15,69 +14,70 @@ const UserPluginsItem = ({
   image,
   author,
   loading,
-  error,
-  handleDelete,
-  handleAuthorClick
-}) => (
-  <div
-    className={cx(
-      common.nuclear,
-      styles.user_plugins_item,
-      { loading, error }
-    )}
-  >
-    {
-      image && !loading &&
+  error
+}) => {
+  const handleDelete = () => {
+    deleteUserPlugin(path);
+  };
+  const handleAuthorClick = () => {
+    onAuthorClick(author);
+  };
+  
+  return (
+    <div
+      className={cx(
+        common.nuclear,
+        styles.user_plugins_item,
+        { loading, error }
+      )}
+    >
+      {image && !loading &&
       <div className={styles.plugin_icon}>
-        <img src={image}/>
-      </div>
-    }
-    {
-      loading &&
-        <div className={styles.plugin_icon}>
-          <Loader type='small' />
-        </div>
-    }
+        <img src={image} />
+      </div>}
+      {loading &&
+      <div className={styles.plugin_icon}>
+        <Loader type='small' />
+      </div>}
 
-    <div className={styles.plugin_info}>
-      <div className={styles.plugin_name}>
-        {name}
-      </div>
-      <div className={styles.plugin_path}>
-        <label>Installed from:</label>
-        <span>{path}</span>
-      </div>
-      <div className={styles.plugin_description}>
-        {description}
-      </div>
+      <div className={styles.plugin_info}>
+        <div className={styles.plugin_name}>
+          {name}
+        </div>
+        <div className={styles.plugin_path}>
+          <label>Installed from:</label>
+          <span>{path}</span>
+        </div>
+        <div className={styles.plugin_description}>
+          {description}
+        </div>
 
-      <div className={styles.plugin_footer}>
-        <div className={styles.plugin_author}>
-          <label>Author:</label>
-          <span className={styles.link} onClick={handleAuthorClick}>
-            {author}
-          </span>
+        <div className={styles.plugin_footer}>
+          <div className={styles.plugin_author}>
+            <label>Author:</label>
+            <span className={styles.link} onClick={handleAuthorClick}>
+              {author}
+            </span>
+          </div>
+          <Button basic inverted icon
+            className={styles.delete_button}
+            onClick={handleDelete}
+          >
+            <Icon name='trash alternate outline' />
+            Uninstall
+          </Button>
         </div>
-        <Button basic inverted icon
-          className={styles.delete_button}
-          onClick={handleDelete}
-        >
-          <Icon name='trash alternate outline'/>
-          Uninstall
-        </Button>
-      </div>
 
-      <div className={styles.error_footer}>
-        {
-          error &&
-            <div className={styles.error_message}>
-              This plugin could not be loaded correctly.
-            </div>
-        }
+        <div className={styles.error_footer}>
+          {error &&
+          <div className={styles.error_message}>
+            This plugin could not be loaded correctly.
+          </div>}
+        </div>
       </div>
     </div>
-  </div>
-);
+  );
+};
 
 UserPluginsItem.propTypes = {
   path: PropTypes.string,
@@ -96,13 +96,4 @@ UserPluginsItem.propTypes = {
   onAuthorClick: PropTypes.func
 };
 
-export default compose(
-  withHandlers({
-    handleDelete: ({path, deleteUserPlugin}) => () => {
-      deleteUserPlugin(path);
-    },
-    handleAuthorClick: ({author, onAuthorClick}) => () => {
-      onAuthorClick(author);
-    }
-  })
-)(UserPluginsItem);
+export default UserPluginsItem;