diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe60329c..48b02c27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,18 +72,6 @@ jobs:
             # Move source pack to dist
             mv ../${CIRCLE_PROJECT_REPONAME}-${CIRCLE_TAG}.tar.gz dist/
 
-      - run:
-          name: "generate static package"
-          command: |
-            # Compile statically
-            make O_STATIC=1 O_NORL=1 strip
-            # Archive
-            tar -cvf ${CIRCLE_PROJECT_REPONAME}-static-${CIRCLE_TAG}.amd64.tar.gz ${CIRCLE_PROJECT_REPONAME}
-            # Move static package to dist
-            mv tar -cvf ${CIRCLE_PROJECT_REPONAME}-static-${CIRCLE_TAG}.amd64.tar.gz dist/
-            # Remove static binary
-            rm ${CIRCLE_PROJECT_REPONAME}
-
       - run:
           name: "publish to GitHub"
           command: |
diff --git a/misc/packagecore/packagecore.yaml b/misc/packagecore/packagecore.yaml
index 6cbc0595..6a83bbb8 100644
--- a/misc/packagecore/packagecore.yaml
+++ b/misc/packagecore/packagecore.yaml
@@ -16,122 +16,122 @@ packages:
       - ncurses
       - readline
     container: "archlinux/base"
-#  centos7.5:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkgconfig
-#      - ncurses-devel
-#      - readline-devel
-#    deps:
-#      - ncurses
-#      - readline
-#    commands:
-#      pre:
-#        - yum install epel-release
-#  centos7.6:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkgconfig
-#      - ncurses-devel
-#      - readline-devel
-#    deps:
-#      - ncurses
-#      - readline
-#    commands:
-#      pre:
-#        - yum install epel-release
-#  centos8.0:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkgconfig
-#      - ncurses-devel
-#      - readline-devel
-#    deps:
-#      - ncurses
-#      - readline
-#    commands:
-#      pre:
-#        - yum install epel-release
-#  debian9:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - libncursesw5-dev
-#      - libreadline-dev
-#    deps:
-#      - libncursesw5
-#      - readline-common
-#  debian10:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - libncursesw5-dev
-#      - libreadline-dev
-#    deps:
-#      - libncursesw5
-#      - readline-common
-#  fedora29:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - ncurses-devel
-#      - readline-devel
-#    deps:
-#      - ncurses
-#      - readline
-#  fedora30:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - ncurses-devel
-#      - readline-devel
-#    deps:
-#      - ncurses
-#      - readline
-#  fedora31:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - ncurses-devel
-#      - readline-devel
-#    deps:
-#      - ncurses
-#      - readline
-#  opensuse15.1:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - readline-devel
-#      - ncurses-devel
-#    deps:
-#      - libncurses6
-#      - libreadline7
-#  ubuntu16.04:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - libncursesw5-dev
-#      - libreadline6-dev
-#    deps:
-#      - libncursesw5
-#      - libreadline6
-#  ubuntu18.04:
-#    builddeps:
-#      - make
-#      - gcc
-#      - pkg-config
-#      - libncursesw5-dev
-#      - libreadline-dev
-#    deps:
-#      - libncursesw5
-#      - libreadline7
+  centos7.5:
+    builddeps:
+      - make
+      - gcc
+      - pkgconfig
+      - ncurses-devel
+      - readline-devel
+    deps:
+      - ncurses
+      - readline
+    commands:
+      pre:
+        - yum install epel-release
+  centos7.6:
+    builddeps:
+      - make
+      - gcc
+      - pkgconfig
+      - ncurses-devel
+      - readline-devel
+    deps:
+      - ncurses
+      - readline
+    commands:
+      pre:
+        - yum install epel-release
+  centos8.0:
+    builddeps:
+      - make
+      - gcc
+      - pkgconfig
+      - ncurses-devel
+      - readline-devel
+    deps:
+      - ncurses
+      - readline
+    commands:
+      pre:
+        - yum install epel-release
+  debian9:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - libncursesw5-dev
+      - libreadline-dev
+    deps:
+      - libncursesw5
+      - readline-common
+  debian10:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - libncursesw5-dev
+      - libreadline-dev
+    deps:
+      - libncursesw5
+      - readline-common
+  fedora29:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - ncurses-devel
+      - readline-devel
+    deps:
+      - ncurses
+      - readline
+  fedora30:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - ncurses-devel
+      - readline-devel
+    deps:
+      - ncurses
+      - readline
+  fedora31:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - ncurses-devel
+      - readline-devel
+    deps:
+      - ncurses
+      - readline
+  opensuse15.1:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - readline-devel
+      - ncurses-devel
+    deps:
+      - libncurses6
+      - libreadline7
+  ubuntu16.04:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - libncursesw5-dev
+      - libreadline6-dev
+    deps:
+      - libncursesw5
+      - libreadline6
+  ubuntu18.04:
+    builddeps:
+      - make
+      - gcc
+      - pkg-config
+      - libncursesw5-dev
+      - libreadline-dev
+    deps:
+      - libncursesw5
+      - libreadline7