diff --git a/Count-CPUs-optimization.patch b/Count-CPUs-optimization.patch
deleted file mode 100644
index 6d62bd3..0000000
--- a/Count-CPUs-optimization.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c95895113d549b5b3b84fe1282fb13d9f5823a0 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 29 May 2020 17:22:35 +0200
-Subject: [PATCH 1/2] journal.sh: Count CPUs optimization
-
----
- src/journal.sh | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/src/journal.sh b/src/journal.sh
-index f7f2fbd..74dc525 100644
---- a/src/journal.sh
-+++ b/src/journal.sh
-@@ -872,15 +872,10 @@ __INTERNAL_CreateHeader(){
-     local line size
-     # CPU info
-     if [ -f "/proc/cpuinfo" ]; then
--        local count=0
--        local type="unknown"
--        local cpu_regex="^model\sname.*: (.*)$"
--        while read -r line; do
--            if [[ "$line" =~ $cpu_regex ]]; then
--                type="${BASH_REMATCH[1]}"
--                let count++
--            fi
--        done < "/proc/cpuinfo"
-+        local cpu_regex count type
-+        cpu_regex="^model\sname.*: (.*)$"
-+        count=$(grep -cE "$cpu_regex" /proc/cpuinfo)
-+        type="$(grep -E -m 1 "$cpu_regex" /proc/cpuinfo | sed -r "s/$cpu_regex/\1/")"
-         __INTERNAL_WriteToMetafile hw_cpu -- "$count x $type"
-         __INTERNAL_LogText "    CPUs          : $count x $type" 2> /dev/null
-     fi
--- 
-2.25.4
-
diff --git a/cleanup-shell-options.patch b/cleanup-shell-options.patch
deleted file mode 100644
index 49a7717..0000000
--- a/cleanup-shell-options.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b5d09cecf16d5473ac60ab2a47e0acc14e676781 Mon Sep 17 00:00:00 2001
-From: Jakub Heger <jheger@redhat.com>
-Date: Thu, 23 May 2019 12:48:15 +0200
-Subject: [PATCH 2/8] testing.sh: improve shell option handling
-
-rlWatchdog() sets -m option but didn't restore it. Can cause troubles in
-rare conditions.
----
- src/testing.sh | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/testing.sh b/src/testing.sh
-index eceb402..44b77ca 100644
---- a/src/testing.sh
-+++ b/src/testing.sh
-@@ -962,6 +962,9 @@ Returns 0 if the command ends normally, without need to be killed.
- =cut
- 
- rlWatchdog() {
-+    # Save current shell options
-+    local shell_options=$(set +o)
-+
-     set -m
-     local command=$1
-     local timeout=$2
-@@ -980,6 +983,8 @@ rlWatchdog() {
-             /bin/kill -- -$pidsleep
-             sleep 1
-             rm -f __INTERNAL_FINISHED __INTERNAL_TIMEOUT
-+            # Restore previous shell options
-+            eval "$shell_options"
-             return 0
-         elif [ -e __INTERNAL_TIMEOUT ]; then
-             rlLog "Command is still running, I am killing it with $killer"
-@@ -992,10 +997,12 @@ rlWatchdog() {
-             /bin/kill -$killer -- -$pidcmd
-             sleep 1
-             rm -f __INTERNAL_FINISHED __INTERNAL_TIMEOUT
-+            eval "$shell_options"
-             return 1
-         fi
-         sleep 1
-     done
-+    eval "$shell_options"
- }
- 
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- 
-2.21.0
-
diff --git a/correct-exit-code-gathering.patch b/correct-exit-code-gathering.patch
deleted file mode 100644
index 4fbb68d..0000000
--- a/correct-exit-code-gathering.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 84b54cb2ea9c3744f327d617f2797efd1f6ac617 Mon Sep 17 00:00:00 2001
-From: Dalibor Pospisil <dapospis@redhat.com>
-Date: Wed, 22 May 2019 11:10:38 +0200
-Subject: [PATCH 1/8] do not masque exit code by 'local' directive
-
-if a variable is set with an command output within local directive,
-the exit code of that command gets lost and exit code of the 'local'
-is used instead which is basically always 0.
----
- src/journal.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/journal.sh b/src/journal.sh
-index 128f9f2..2e8d616 100644
---- a/src/journal.sh
-+++ b/src/journal.sh
-@@ -810,8 +810,9 @@ __INTERNAL_CreateHeader(){
-     __INTERNAL_LogText "    Test name     : ${__INTERNAL_TEST_NAME}" 2> /dev/null
- 
-     local test_version="${testversion:-$TESTVERSION}"
-+    local test_rpm
-     # get number of itesm of BASH_SOURCE-1 to get last item of the array
--    local test_rpm=$(rpm -qf ${BASH_SOURCE[$((${#BASH_SOURCE[@]}-1))]} 2> /dev/null) \
-+    test_rpm=$(rpm -qf ${BASH_SOURCE[$((${#BASH_SOURCE[@]}-1))]} 2> /dev/null) \
-       && test_version=$(rpm --qf "%{version}-%{release}" -q $test_rpm 2> /dev/null)
- 
-     [[ -n "$test_version" ]] && {
--- 
-2.21.0
-
diff --git a/enahanced-library-search.patch b/enahanced-library-search.patch
deleted file mode 100644
index b8ae6cb..0000000
--- a/enahanced-library-search.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 6caca72e63add35ef066cca1dbeae6857ec34b2b Mon Sep 17 00:00:00 2001
-From: Dalibor Pospisil <dapospis@redhat.com>
-Date: Mon, 8 Jun 2020 17:11:51 +0200
-Subject: [PATCH 2/2] enahanced library search
-
----
- src/libraries.sh | 71 ++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 56 insertions(+), 15 deletions(-)
-
-diff --git a/src/libraries.sh b/src/libraries.sh
-index 2ccc02e..b40b513 100644
---- a/src/libraries.sh
-+++ b/src/libraries.sh
-@@ -98,7 +98,7 @@ __INTERNAL_rlLibraryTraverseUpwards() {
-   while [ "$DIRECTORY" != "/" ]
-   do
-     DIRECTORY="$( dirname $DIRECTORY )"
--    if [ -d "$DIRECTORY/$COMPONENT" ]
-+    if [[ -d "$DIRECTORY/$COMPONENT" || -d "$DIRECTORY/libs/$COMPONENT/$LIBRARY" ]]
-     then
- 
-       local CANDIDATE="$DIRECTORY/$COMPONENT/Library/$LIBRARY/lib.sh"
-@@ -114,6 +114,14 @@ __INTERNAL_rlLibraryTraverseUpwards() {
-         LIBFILE="$CANDIDATE"
-         break
-       fi
-+
-+      local CANDIDATE="$DIRECTORY/libs/$COMPONENT/$LIBRARY/lib.sh"
-+      if [ -f "$CANDIDATE" ]
-+      then
-+        LIBFILE="$CANDIDATE"
-+        break
-+      fi
-+
-     fi
-   done
- }
-@@ -139,6 +147,20 @@ __INTERNAL_rlLibrarySearchInRoot(){
-     return
-   fi
- 
-+  local CANDIDATE="$BEAKERLIB_LIBRARY_PATH/$COMPONENT/$LIBRARY/lib.sh"
-+  if [ -f "$CANDIDATE" ]
-+  then
-+    LIBFILE="$CANDIDATE"
-+    return
-+  fi
-+
-+  local CANDIDATE="$BEAKERLIB_LIBRARY_PATH/libs/$COMPONENT/$LIBRARY/lib.sh"
-+  if [ -f "$CANDIDATE" ]
-+  then
-+    LIBFILE="$CANDIDATE"
-+    return
-+  fi
-+
-   rlLogDebug "rlImport: Library not found in $BEAKERLIB_LIBRARY_PATH"
- }
- 
-@@ -151,16 +173,20 @@ __INTERNAL_rlLibrarySearch() {
- 
-   if [ -n "$BEAKERLIB_LIBRARY_PATH" ]
-   then
--    rlLogDebug "rlImport: BEAKERLIB_LIBRARY_PATH is set: trying to search in it"
--
--    __INTERNAL_rlLibrarySearchInRoot "$COMPONENT" "$LIBRARY" "$BEAKERLIB_LIBRARY_PATH"
--    if [ -n "$LIBFILE" ]
--    then
--      local VERSION="$(__INTERNAL_extractLibraryVersion "$LIBFILE" "$COMPONENT/$LIBRARY")"
--      VERSION=${VERSION:+", version '$VERSION'"}
--      rlLogInfo "rlImport: Found '$COMPONENT/$LIBRARY'$VERSION in BEAKERLIB_LIBRARY_PATH"
--      return
--    fi
-+    rlLogDebug "rlImport: BEAKERLIB_LIBRARY_PATH='$BEAKERLIB_LIBRARY_PATH'"
-+    local paths=( ${BEAKERLIB_LIBRARY_PATH//:/ } )
-+    while [[ -n "$paths" ]]; do
-+      rlLogDebug "$FUNCNAME(): trying $paths component of BEAKERLIB_LIBRARY_PATH"
-+      __INTERNAL_rlLibrarySearchInRoot "$COMPONENT" "$LIBRARY" "$paths"
-+      if [ -n "$LIBFILE" ]
-+      then
-+        local VERSION="$(__INTERNAL_extractLibraryVersion "$LIBFILE" "$COMPONENT/$LIBRARY")"
-+        VERSION=${VERSION:+", version '$VERSION'"}
-+        rlLogInfo "rlImport: Found '$COMPONENT/$LIBRARY'$VERSION in BEAKERLIB_LIBRARY_PATH"
-+        return
-+      fi
-+      paths=( "${paths[@]:1}" )
-+    done
-   else
-     rlLogDebug "rlImport: No BEAKERLIB_LIBRARY_PATH set: trying default"
-   fi
-@@ -213,10 +239,25 @@ The library search mechanism is based on Beaker test hierarchy system, i.e.:
- 
- /component/type/test-name/test-file
- 
--When test-file calls rlImport with 'foo/bar' parameter, the directory path
--is traversed upwards, and a check for presence of the test /foo/Library/bar/
--will be performed. This means this function needs to be called from
--the test hierarchy, not e.g. the /tmp directory.
-+When test-file calls rlImport with 'foo/bar' parameter, the libraries are searched
-+in following locations:
-+these are the possible path prefixes
-+
-+    - colon-separated paths from $BEAKERLIB_LIBRARY_PATH
-+    - /mnt/tests
-+    - /usr/share/beakerlib-libraries
-+
-+the next component of the path is one of the following:
-+
-+    - /foo/Library/bar
-+    - /*/foo/Library/bar
-+    - /libs/foo/bar
-+
-+the directory path is then constructed as prefix/path/lib.sh
-+If the library is still not found an upwards directory traversal is used, and a
-+check for presence of the library in /foo/Library/bar/ or libs/foo/bar/ is to be
-+performed. This means this function needs to be called from the test hierarchy,
-+not e.g. the /tmp directory.
- 
- Once library is found, it is sourced and a verifier function is called.
- The verifier function is cunstructed by composing the library prefix and
--- 
-2.25.4
-
diff --git a/fix-unbound-variables.patch b/fix-unbound-variables.patch
deleted file mode 100644
index fa50001..0000000
--- a/fix-unbound-variables.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 57ad9345c5fb4d893de7a969c7a83826c4476a93 Mon Sep 17 00:00:00 2001
-From: Dalibor Pospisil <dapospis@redhat.com>
-Date: Mon, 3 Jun 2019 16:39:42 +0200
-Subject: [PATCH] fix unbound variables
-
----
- src/beakerlib.sh | 6 ++++++
- src/rpms.sh      | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/beakerlib.sh b/src/beakerlib.sh
-index c123e3d..de54a63 100644
---- a/src/beakerlib.sh
-+++ b/src/beakerlib.sh
-@@ -31,6 +31,7 @@
- #   Boston, MA 02110-1301, USA.
- #
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+__INTERNAL_SOURCED=${__INTERNAL_SOURCED-}
- echo "${__INTERNAL_SOURCED}" | grep -qF -- " ${BASH_SOURCE} " && return || __INTERNAL_SOURCED+=" ${BASH_SOURCE} "
- 
- : <<'=cut'
-@@ -410,6 +411,11 @@ export __INTERNAL_PERSISTENT_TMP=/var/tmp
- test -f /etc/profile.d/cobbler.sh && . /etc/profile.d/cobbler.sh
- 
- set -e
-+BEAKERLIB_DIR=${BEAKERLIB_DIR-}
-+TESTID=${TESTID-}
-+JOBID=${JOBID-}
-+RECIPEID=${RECIPEID-}
-+BEAKERLIB_JOURNAL=${BEAKERLIB_JOURNAL-}
- export BEAKERLIB=${BEAKERLIB:-"/usr/share/beakerlib"}
- . $BEAKERLIB/storage.sh
- . $BEAKERLIB/infrastructure.sh
-diff --git a/src/rpms.sh b/src/rpms.sh
-index 144275c..3b55473 100644
---- a/src/rpms.sh
-+++ b/src/rpms.sh
-@@ -533,7 +533,7 @@ rlAssertRequired(){
- }
- 
- 
--: <<=cut
-+: <<'=cut'
- =pod
- 
- =head2 Getting RPMs
--- 
-2.21.0
-
diff --git a/getopt-errors.patch b/getopt-errors.patch
deleted file mode 100644
index 43ebaed..0000000
--- a/getopt-errors.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From dbaa50c025dbfc3d8574e57ddbfa8e4cbf1b89d5 Mon Sep 17 00:00:00 2001
-From: Dalibor Pospisil <dapospis@redhat.com>
-Date: Sun, 28 Apr 2019 21:02:59 +0200
-Subject: [PATCH 2/2] do not suppress getopt error
-
-getopt was often used with -q option
-now the stderr output is processed and logged as an error message
----
- src/infrastructure.sh  | 12 ++++++------
- src/logging.sh         |  2 +-
- src/storage.sh         |  2 +-
- src/synchronisation.sh |  8 ++++----
- src/testing.sh         |  6 +++---
- 5 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/infrastructure.sh b/src/infrastructure.sh
-index 4c76736..1c97205 100644
---- a/src/infrastructure.sh
-+++ b/src/infrastructure.sh
-@@ -219,7 +219,7 @@ Returns 0 if mounting the share was successful.
- 
- rlMount() {
-     local OPTIONS=''
--    local GETOPT=$(getopt -q -o o: -- "$@"); eval set -- "$GETOPT"
-+    local GETOPT=$(getopt -o o: -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done)); eval set -- "$GETOPT"
-     while true; do
-       case $1 in
-         --) shift; break; ;;
-@@ -288,7 +288,7 @@ options, 2 otherwise.
- 
- rlCheckMount() {
-     local MNTOPTS=''
--    local GETOPT=$(getopt -q -o o: -- "$@"); eval set -- "$GETOPT"
-+    local GETOPT=$(getopt -o o: -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done)); eval set -- "$GETOPT"
-     while true; do
-       case $1 in
-         --) shift; break; ;;
-@@ -383,7 +383,7 @@ the mountpoint uses all the given options.
- 
- rlAssertMount() {
-     local MNTOPTS=''
--    local GETOPT=$(getopt -q -o o: -- "$@"); eval set -- "$GETOPT"
-+    local GETOPT=$(getopt -o o: -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done)); eval set -- "$GETOPT"
-     while true; do
-       case $1 in
-         --) shift; break; ;;
-@@ -461,7 +461,7 @@ Returns 0 if success.
- =cut
- 
- rlHash() {
--  local GETOPT=$(getopt -q -o a: -l decode,algorithm:,stdin -- "$@"); eval set -- "$GETOPT"
-+  local GETOPT=$(getopt -o a: -l decode,algorithm:,stdin -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done)); eval set -- "$GETOPT"
-   local decode=0 alg="$rlHashAlgorithm" stdin=0
-   while true; do
-     case $1 in
-@@ -637,7 +637,7 @@ rlFileBackup() {
-     local IFS
- 
-     # getopt will cut off first long opt when no short are defined
--    OPTS=$(getopt -o "." -l "clean,namespace:,no-missing-ok,missing-ok" -- "$@")
-+    OPTS=$(getopt -o "." -l "clean,namespace:,no-missing-ok,missing-ok" -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     [ $? -ne 0 ] && return 1
- 
-     eval set -- "$OPTS"
-@@ -813,7 +813,7 @@ rlFileRestore() {
-     local IFS
- 
-     # getopt will cut off first long opt when no short are defined
--    OPTS=$(getopt -o "n:" -l "namespace:" -- "$@")
-+    OPTS=$(getopt -o "n:" -l "namespace:" -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     [ $? -ne 0 ] && return 1
- 
-     eval set -- "$OPTS"
-diff --git a/src/logging.sh b/src/logging.sh
-index e49dcb4..79df02b 100644
---- a/src/logging.sh
-+++ b/src/logging.sh
-@@ -487,7 +487,7 @@ rlFileSubmit -s '_' /etc/passwd -> etc_passwd
- =cut
- 
- rlFileSubmit() {
--    GETOPT=$(getopt -q -o s: -- "$@")
-+    GETOPT=$(getopt -o s: -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     eval set -- "$GETOPT"
- 
-     SEPARATOR='-'
-diff --git a/src/storage.sh b/src/storage.sh
-index b3f7636..a1b4ae3 100644
---- a/src/storage.sh
-+++ b/src/storage.sh
-@@ -46,7 +46,7 @@ __INTERNAL_STORAGE_DEFAULT_NAMESPACE="GENERIC"
- __INTERNAL_ST_OPTION_PARSER='
-   local namespace="$__INTERNAL_STORAGE_DEFAULT_NAMESPACE"
-   local section="$__INTERNAL_STORAGE_DEFAULT_SECTION"
--  local GETOPT=$(getopt -o : -l namespace:,section: -- "$@") || return 126
-+  local GETOPT=$(getopt -o : -l namespace:,section: -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done)) || return 126
-   eval set -- "$GETOPT"
-   while true; do
-     case $1 in
-diff --git a/src/synchronisation.sh b/src/synchronisation.sh
-index 3c7c275..dcff59d 100644
---- a/src/synchronisation.sh
-+++ b/src/synchronisation.sh
-@@ -118,7 +118,7 @@ __INTERNAL_wait_for_cmd() {
-     shift 1
- 
-     # that is the GNU extended getopt syntax!
--    local TEMP=$(getopt -o t:p:m:d:r: -n '$routine_name' -- "$@")
-+    local TEMP=$(getopt -o t:p:m:d:r: -n '$routine_name' -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     if [[ $? != 0 ]] ; then
-         rlLogError "$routine_name: Can't parse command options, terminating..."
-         return 127
-@@ -345,7 +345,7 @@ rlWaitForFile() {
-     local file=""
- 
-     # that is the GNU extended getopt syntax!
--    local TEMP=$(getopt -o t:p:d: -n 'rlWaitForFile' -- "$@")
-+    local TEMP=$(getopt -o t:p:d: -n 'rlWaitForFile' -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     if [[ $? != 0 ]] ; then
-         rlLogError "rlWaitForSocket: Can't parse command options, terminating..."
-         return 127
-@@ -436,7 +436,7 @@ rlWaitForSocket(){
-     local field="5"
- 
-     # that is the GNU extended getopt syntax!
--    local TEMP=$(getopt -o t:p:d: --longoptions close,remote -n 'rlWaitForSocket' -- "$@")
-+    local TEMP=$(getopt -o t:p:d: --longoptions close,remote -n 'rlWaitForSocket' -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     if [[ $? != 0 ]] ; then
-         rlLogError "rlWaitForSocket: Can't parse command options, terminating..."
-         return 127
-@@ -530,7 +530,7 @@ Signal used to kill the process, optional SIGTERM by default.
- 
- rlWait() {
-     # that is the GNU extended getopt syntax!
--    local TEMP=$(getopt -o t:s: -n 'rlWait' -- "$@")
-+    local TEMP=$(getopt -o t:s: -n 'rlWait' -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     if [[ $? != 0 ]]; then
-         rlLogError "rlWait: Can't parse command options, terminating..."
-         return 128
-diff --git a/src/testing.sh b/src/testing.sh
-index e97bd01..eceb402 100644
---- a/src/testing.sh
-+++ b/src/testing.sh
-@@ -717,7 +717,7 @@ explain what are you doing here).
- Returns the exit code of the command run. Asserts PASS when
- command\'s exit status is in the list of expected exit codes.
- 
--Note: 
-+Note:
- 
- =over
- 
-@@ -754,7 +754,7 @@ B<Warning:> using C<unbuffer> tool is now disabled because of bug 547686.
- #'
- 
- rlRun() {
--    local __INTERNAL_rlRun_GETOPT=$(getopt -q -o lcts -- "$@")
-+    local __INTERNAL_rlRun_GETOPT=$(getopt -o lcts -- "$@" 2> >(while read -r line; do rlLogError "$FUNCNAME: $line"; done))
-     eval set -- "$__INTERNAL_rlRun_GETOPT"
- 
-     local __INTERNAL_rlRun_DO_LOG=false
-@@ -1194,7 +1194,7 @@ __INTERNAL_rlIsDistro(){
-   local whole="$(beakerlib-lsb_release -rs)"
-   local major="$(beakerlib-lsb_release -rs | cut -d '.' -f 1)"
-   local IFS
--  
-+
-   rlLogDebug "distro='$distro'"
-   rlLogDebug "major='$major'"
-   rlLogDebug "whole='$whole'"
--- 
-2.17.2
-
diff --git a/local-FileSubmit-argument.patch b/local-FileSubmit-argument.patch
deleted file mode 100644
index 2fed32a..0000000
--- a/local-FileSubmit-argument.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a8080d22f4d8c2c47781620078dca6d47f5439e9 Mon Sep 17 00:00:00 2001
-From: Jakub Heger <jheger@redhat.com>
-Date: Fri, 31 May 2019 13:11:39 +0200
-Subject: [PATCH 5/8] logging.sh: fix __INTERNAL_FileSubmit argument
-
-recently arguments were removed when calling __INTERNAL_FileSubmit
-however the function used positional arguments which were now shifted
----
- src/logging.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/logging.sh b/src/logging.sh
-index 79df02b..22c34b8 100644
---- a/src/logging.sh
-+++ b/src/logging.sh
-@@ -137,7 +137,7 @@ __INTERNAL_LogText() {
- }
- 
- __INTERNAL_FileSubmit() {
--    local FILENAME="$4"
-+    local FILENAME="$2"
-     local STORENAME="$__INTERNAL_PERSISTENT_TMP/BEAKERLIB_${TESTID}_STORED_$(basename $FILENAME)"
-     if [ -z "$TESTID" ]
-     then
--- 
-2.21.0
-
diff --git a/log-command-T-option.patch b/log-command-T-option.patch
deleted file mode 100644
index f186344..0000000
--- a/log-command-T-option.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 01d3445a1798b20b4fd452c2fb7691b8dd35245c Mon Sep 17 00:00:00 2001
-From: Dalibor Pospisil <dapospis@redhat.com>
-Date: Sun, 28 Apr 2019 20:29:57 +0200
-Subject: [PATCH 1/2] do not call submit_log command with -T option
-
-the option -T was deprecated and the information is now gatheres via
-RECIPETESTID environment variable
----
- src/journal.sh | 2 +-
- src/logging.sh | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal.sh b/src/journal.sh
-index 8a91276..f556ba9 100644
---- a/src/journal.sh
-+++ b/src/journal.sh
-@@ -259,7 +259,7 @@ rlJournalEnd(){
- 
-     if [ -n "$TESTID" ] ; then
-         __INTERNAL_JournalXMLCreate
--        $BEAKERLIB_COMMAND_SUBMIT_LOG -T $TESTID -l $__INTERNAL_BEAKERLIB_JOURNAL \
-+        $BEAKERLIB_COMMAND_SUBMIT_LOG -l $__INTERNAL_BEAKERLIB_JOURNAL \
-         || rlLogError "rlJournalEnd: Submit wasn't successful"
-     else
-         [[ "$BEAKERLIB_JOURNAL" == "0" ]] || rlLog "JOURNAL XML: $__INTERNAL_BEAKERLIB_JOURNAL"
-diff --git a/src/logging.sh b/src/logging.sh
-index 70c4c92..e49dcb4 100644
---- a/src/logging.sh
-+++ b/src/logging.sh
-@@ -528,7 +528,7 @@ rlFileSubmit() {
-           BEAKERLIB_COMMAND_SUBMIT_LOG="$__INTERNAL_DEFAULT_SUBMIT_LOG"
-         fi
- 
--        $BEAKERLIB_COMMAND_SUBMIT_LOG -T "$TESTID" -l "$TMPDIR/$ALIAS"
-+        $BEAKERLIB_COMMAND_SUBMIT_LOG -l "$TMPDIR/$ALIAS"
-         RETVAL=$?
-     fi
-     rm -rf $TMPDIR
--- 
-2.17.2
-
diff --git a/services-state-store.patch b/services-state-store.patch
deleted file mode 100644
index 4b4b2e2..0000000
--- a/services-state-store.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 96c657ea8ddc84203f624872c18765ccd1467743 Mon Sep 17 00:00:00 2001
-From: Dalibor Pospisil <dapospis@redhat.com>
-Date: Mon, 3 Jun 2019 16:42:28 +0200
-Subject: [PATCH 8/8] generate correct path to the services state store
-
----
- src/infrastructure.sh | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/infrastructure.sh b/src/infrastructure.sh
-index 1c97205..1294b7c 100644
---- a/src/infrastructure.sh
-+++ b/src/infrastructure.sh
-@@ -984,8 +984,6 @@ __INTERNAL_SYSTEMCTL() {
-   systemctl --no-pager "$@"
- }
- 
--__INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
--
- rlServiceStart() {
-     # at least one service has to be supplied
-     if [ $# -lt 1 ]; then
-@@ -997,6 +995,7 @@ rlServiceStart() {
-     local failed=0
- 
-     # create file to store list of services, if it doesn't already exist
-+    local __INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
-     touch $__INTERNAL_SERVICES_LIST
- 
-     local service
-@@ -1092,6 +1091,7 @@ rlServiceStop() {
-     local failed=0
- 
-     # create file to store list of services, if it doesn't already exist
-+    local __INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
-     touch $__INTERNAL_SERVICES_LIST
- 
-     local service
-@@ -1173,6 +1173,7 @@ original state; thus zero is returned when everything is OK.
- 
- rlServiceRestore() {
-     # create file to store list of services, if it doesn't already exist
-+    local __INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
-     touch $__INTERNAL_SERVICES_LIST
- 
-     if [ $# -lt 1 ]; then
--- 
-2.21.0
-