diff --git a/sources/lib/core/notify_mail.sh b/sources/lib/core/notify_mail.sh
index 34f201e..923ebd1 100644
--- a/sources/lib/core/notify_mail.sh
+++ b/sources/lib/core/notify_mail.sh
@@ -70,8 +70,6 @@ typeset _FROM_MSG="${EXEC_USER}@${HOST_NAME}"
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP1_MAIL_FILE} ]] && rm -f ${_TMP1_MAIL_FILE} >/dev/null 2>&1; [[ -f ${_TMP2_MAIL_FILE} ]] && rm -f ${_TMP2_MAIL_FILE} >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP1_MAIL_FILE} ]] && rm -f ${_TMP1_MAIL_FILE} >/dev/null 2>&1; [[ -f ${_TMP2_MAIL_FILE} ]] && rm -f ${_TMP2_MAIL_FILE} >/dev/null 2>&1; return 1" 1 2 3 15
 
 # set short paths for STDOUT/STDERR logs
diff --git a/sources/lib/platform/aix/check_aix_file_change.sh b/sources/lib/platform/aix/check_aix_file_change.sh
index 00e503f..2e94b1e 100644
--- a/sources/lib/platform/aix/check_aix_file_change.sh
+++ b/sources/lib/platform/aix/check_aix_file_change.sh
@@ -25,6 +25,7 @@
 # @(#) HISTORY:
 # @(#) 2017-05-18: initial version [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_aix_file_change
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -66,12 +67,6 @@ set -o noglob       # no file globbing
 
 # set local trap for clean-up
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP_EXCL_FILE} ]] && rm -f ${_TMP_EXCL_FILE} >/dev/null 2>&1;
-      return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1;
@@ -339,6 +334,12 @@ then
     }
 fi
 
+# do cleanup
+[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
+[[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
+[[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1
+[[ -f ${_TMP_EXCL_FILE} ]] && rm -f ${_TMP_EXCL_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/hp-ux/check_hpux_file_age.sh b/sources/lib/platform/hp-ux/check_hpux_file_age.sh
index cdbbbed..f65b4ae 100644
--- a/sources/lib/platform/hp-ux/check_hpux_file_age.sh
+++ b/sources/lib/platform/hp-ux/check_hpux_file_age.sh
@@ -25,6 +25,7 @@
 # @(#) 2013-05-27: initial version [Patrick Van der Veken]
 # @(#) 2013-05-29: added local trap for cleanup [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_hpux_file_age
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="HP-UX"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -55,8 +56,6 @@ typeset _FILE_DIR=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_REF_FILE} ]] && rm -f ${_REF_FILE} >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_REF_FILE} ]] && rm -f ${_REF_FILE} >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
diff --git a/sources/lib/platform/hp-ux/check_hpux_file_change.sh b/sources/lib/platform/hp-ux/check_hpux_file_change.sh
index 74c389e..df40896 100644
--- a/sources/lib/platform/hp-ux/check_hpux_file_change.sh
+++ b/sources/lib/platform/hp-ux/check_hpux_file_change.sh
@@ -25,6 +25,7 @@
 # @(#) HISTORY:
 # @(#) 2017-05-18: initial version [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_hpux_file_change
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="HP-UX"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -66,12 +67,6 @@ set -o noglob       # no file globbing
 
 # set local trap for clean-up
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP_EXCL_FILE} ]] && rm -f ${_TMP_EXCL_FILE} >/dev/null 2>&1;
-      return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1;
@@ -339,6 +334,12 @@ then
     }
 fi
 
+# do cleanup
+[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
+[[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
+[[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1
+[[ -f ${_TMP_EXCL_FILE} ]] && rm -f ${_TMP_EXCL_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/hp-ux/check_hpux_lunpaths.sh b/sources/lib/platform/hp-ux/check_hpux_lunpaths.sh
index 03eba63..e292dc0 100644
--- a/sources/lib/platform/hp-ux/check_hpux_lunpaths.sh
+++ b/sources/lib/platform/hp-ux/check_hpux_lunpaths.sh
@@ -25,6 +25,7 @@
 # @(#) 2017-12-20: initial version [Patrick Van der Veken]
 # @(#) 2018-18-22: reworked discovery routine (accommdate large number of LUNS)
 # @(#)             [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -37,7 +38,7 @@ typeset _IOSCAN_BIN="/usr/sbin/ioscan"
 typeset _IOSCAN_OPTS="-C disk -P wwid"
 typeset _SCSIMGR_BIN="/usr/sbin/scsimgr"
 typeset _SCSIMGR_OPTS="-v get_info all_lun"
-typeset _VERSION="2018-10-22"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="HP-UX"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -84,10 +85,6 @@ fi
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
-      return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
       return 1" 1 2 3 15
@@ -250,6 +247,10 @@ cat ${_TMP1_FILE} >>${HC_STDOUT_LOG}
 printf "\n\n=== scsimgr ===" >>${HC_STDOUT_LOG}
 cat ${_TMP2_FILE} >>${HC_STDOUT_LOG}
 
+# do cleanup
+[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
+[[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/hp-ux/check_hpux_sg_cluster_config.sh b/sources/lib/platform/hp-ux/check_hpux_sg_cluster_config.sh
index 533700a..9da2d73 100644
--- a/sources/lib/platform/hp-ux/check_hpux_sg_cluster_config.sh
+++ b/sources/lib/platform/hp-ux/check_hpux_sg_cluster_config.sh
@@ -25,6 +25,7 @@
 # @(#) 2016-03-08: initial version [Patrick Van der Veken]
 # @(#) 2016-12-01: more standardized error handling [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_hpux_sg_cluster_config
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="HP-UX"                    # uname -s match
 typeset _SG_DAEMON="/usr/lbin/cmcld"
 # rubbish that cmgetconf outputs to STDOUT instead of STDERR
@@ -60,8 +61,6 @@ typeset _CLUSTER_VALUE=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "rm -f ${_CLUSTER_RUN_FILE}.* ${_CLUSTER_CFG_FILE}.* >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "rm -f ${_CLUSTER_RUN_FILE}.* ${_CLUSTER_CFG_FILE}.* >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -168,6 +167,9 @@ do
     done <${_CLUSTER_CFG_FILE}.${_CLUSTER_INSTANCE}
 done
 
+# do cleanup
+rm -f ${_CLUSTER_RUN_FILE}.* ${_CLUSTER_CFG_FILE}.* >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/hp-ux/check_hpux_sg_package_config.sh b/sources/lib/platform/hp-ux/check_hpux_sg_package_config.sh
index 500bfbd..5d8538d 100644
--- a/sources/lib/platform/hp-ux/check_hpux_sg_package_config.sh
+++ b/sources/lib/platform/hp-ux/check_hpux_sg_package_config.sh
@@ -25,6 +25,7 @@
 # @(#) 2016-03-08: initial version [Patrick Van der Veken]
 # @(#) 2016-12-01: more standardized error handling [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_hpux_sg_package_config
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"							# YYYY-MM-DD
+typeset _VERSION="2018-11-18"							# YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="HP-UX"                    # uname -s match
 typeset _SG_DAEMON="/usr/lbin/cmcld"
 # rubbish that cmgetconf outputs to STDOUT instead of STDERR
@@ -70,8 +71,6 @@ done
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "rm -f ${_PKG_RUN_FILE}.* ${_PKG_CFG_FILE}.* >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "rm -f ${_PKG_RUN_FILE}.* ${_PKG_CFG_FILE}.* >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle configuration file
@@ -168,6 +167,9 @@ do
     done <${_PKG_CFG_FILE}.${_PKG_INSTANCE}
 done
 
+# do cleanup
+rm -f ${_PKG_RUN_FILE}.* ${_PKG_CFG_FILE}.* >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/hp-ux/check_hpux_syslog.sh b/sources/lib/platform/hp-ux/check_hpux_syslog.sh
index 311a84a..1edfef4 100644
--- a/sources/lib/platform/hp-ux/check_hpux_syslog.sh
+++ b/sources/lib/platform/hp-ux/check_hpux_syslog.sh
@@ -25,6 +25,7 @@
 # @(#) 2016-06-20: initial version [Patrick Van der Veken]
 # @(#) 2017-05-18: do not update the state file with --no-log [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -35,7 +36,7 @@ function check_hpux_syslog
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
 typeset _STATE_FILE="${STATE_PERM_DIR}/discovered.syslog"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="HP-UX"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -64,8 +65,6 @@ done
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle configuration file
@@ -147,6 +146,9 @@ fi
 # handle results
 log_hc "$0" ${_STC} "${_MSG}"
 
+# do cleanup
+[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_file_change.sh b/sources/lib/platform/linux/check_linux_file_change.sh
index 0ac1edc..ede28a9 100644
--- a/sources/lib/platform/linux/check_linux_file_change.sh
+++ b/sources/lib/platform/linux/check_linux_file_change.sh
@@ -26,6 +26,7 @@
 # @(#) 2017-05-18: initial version [Patrick Van der Veken]
 # @(#) 2018-05-21: STDERR fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -35,7 +36,7 @@ function check_linux_file_change
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -67,12 +68,6 @@ set -o noglob       # no file globbing
 
 # set local trap for clean-up
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1;
-      [[ -f ${_TMP_EXCL_FILE} ]] && rm -f ${_TMP_EXCL_FILE} >/dev/null 2>&1;
-      return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1;
       [[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1;
@@ -340,6 +335,12 @@ then
     }
 fi
 
+# do cleanup
+[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
+[[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
+[[ -f ${_TMP_INCL_FILE} ]] && rm -f ${_TMP_INCL_FILE} >/dev/null 2>&1
+[[ -f ${_TMP_EXCL_FILE} ]] && rm -f ${_TMP_EXCL_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_hpacucli.sh b/sources/lib/platform/linux/check_linux_hpacucli.sh
index acc1bdb..5e9e8b4 100644
--- a/sources/lib/platform/linux/check_linux_hpacucli.sh
+++ b/sources/lib/platform/linux/check_linux_hpacucli.sh
@@ -25,6 +25,7 @@
 # @(#) 2013-09-09: initial version [Patrick Van der Veken]
 # @(#) 2018-05-21: STDERR fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -58,8 +59,6 @@ typeset _DO_CHECK=0
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -264,6 +263,9 @@ then
     log_hc "$0" 0 "${_MSG}"
 fi
 
+# do cleanup
+[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_hpasmcli.sh b/sources/lib/platform/linux/check_linux_hpasmcli.sh
index db8c377..0956f52 100644
--- a/sources/lib/platform/linux/check_linux_hpasmcli.sh
+++ b/sources/lib/platform/linux/check_linux_hpasmcli.sh
@@ -26,6 +26,7 @@
 # @(#) 2017-04-06: bugfix in temperature checking [Patrick Van der Veken]
 # @(#) 2018-05-21: STDERR fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -35,7 +36,7 @@ function check_linux_hpasmcli
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -63,8 +64,6 @@ typeset _TEMP_UNIT=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -275,6 +274,9 @@ then
     log_hc "$0" 0 "${_MSG}"
 fi
 
+# do cleanup
+[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_hplog.sh b/sources/lib/platform/linux/check_linux_hplog.sh
index 6f1a460..d8b5f9d 100644
--- a/sources/lib/platform/linux/check_linux_hplog.sh
+++ b/sources/lib/platform/linux/check_linux_hplog.sh
@@ -25,6 +25,7 @@
 # @(#) 2017-04-22: initial version [Patrick Van der Veken]
 # @(#) 2018-05-21: added dump_logs() & STDERR fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -35,7 +36,7 @@ function check_linux_hplog
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
 typeset _STATE_FILE="${STATE_PERM_DIR}/discovered.hplog"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -57,10 +58,6 @@ typeset _EVENT_ENTRY=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
-      [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
-      return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
       [[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
       return 1" 1 2 3 15
@@ -162,6 +159,10 @@ else
 fi
 log_hc "$0" ${_STC} "${_MSG}"
 
+# do cleanup
+[[ -f ${_TMP1_FILE} ]] && rm -f ${_TMP1_FILE} >/dev/null 2>&1
+[[ -f ${_TMP2_FILE} ]] && rm -f ${_TMP2_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_hpssacli.sh b/sources/lib/platform/linux/check_linux_hpssacli.sh
index 0f91548..78aeae5 100644
--- a/sources/lib/platform/linux/check_linux_hpssacli.sh
+++ b/sources/lib/platform/linux/check_linux_hpssacli.sh
@@ -25,6 +25,7 @@
 # @(#) 2016-04-01: initial version [Patrick Van der Veken]
 # @(#) 2018-05-21: STDERR fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_linux_hpssacli
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -58,8 +59,6 @@ typeset _DO_CHECK=0
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -264,6 +263,8 @@ then
     log_hc "$0" 0 "${_MSG}"
 fi
 
+[[ -f ${_TMP_FILE} ]] && rm -f ${_TMP_FILE} >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_process_limits.sh b/sources/lib/platform/linux/check_linux_process_limits.sh
index 4fced8a..b0a1b0e 100644
--- a/sources/lib/platform/linux/check_linux_process_limits.sh
+++ b/sources/lib/platform/linux/check_linux_process_limits.sh
@@ -25,6 +25,7 @@
 # @(#) 2018-07-10: original version [Patrick Van der Veken]
 # @(#) 2018-07-12: better log_healthy handling [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_linux_process_limits
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -66,8 +67,6 @@ typeset _USER_PS_COMM=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "rm -f ${_INSTANCE_RUN_FILE}.* >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "rm -f ${_INSTANCE_RUN_FILE}.* >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -364,6 +363,9 @@ else
     warn "limit on (${_LIMIT_TYPE} on '${_LIMIT_NAME}' was not checked (PID=${_LIMIT_PID})"
 fi
 
+# do cleanup
+rm -f ${_INSTANCE_RUN_FILE}.* >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_sg_cluster_config.sh b/sources/lib/platform/linux/check_linux_sg_cluster_config.sh
index 6b15512..ebf0cf4 100644
--- a/sources/lib/platform/linux/check_linux_sg_cluster_config.sh
+++ b/sources/lib/platform/linux/check_linux_sg_cluster_config.sh
@@ -25,6 +25,7 @@
 # @(#) 2017-04-01: initial version [Patrick Van der Veken]
 # @(#) 2018-05-21: added dump_logs() & other fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_linux_sg_cluster_config
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 typeset _SG_DAEMON="/opt/cmcluster/bin/cmcld"
 # rubbish that cmgetconf outputs to STDOUT instead of STDERR
@@ -61,8 +62,6 @@ typeset _CLUSTER_VALUE=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "rm -f ${_CLUSTER_RUN_FILE}.* ${_CLUSTER_CFG_FILE}.* >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "rm -f ${_CLUSTER_RUN_FILE}.* ${_CLUSTER_CFG_FILE}.* >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -171,6 +170,9 @@ do
     done <${_CLUSTER_CFG_FILE}.${_CLUSTER_INSTANCE}
 done
 
+# do cleanup
+rm -f ${_CLUSTER_RUN_FILE}.* ${_CLUSTER_CFG_FILE}.* >/dev/null 2>&1
+
 return 0
 }
 
diff --git a/sources/lib/platform/linux/check_linux_sg_package_config.sh b/sources/lib/platform/linux/check_linux_sg_package_config.sh
index bb7de00..1b7661d 100644
--- a/sources/lib/platform/linux/check_linux_sg_package_config.sh
+++ b/sources/lib/platform/linux/check_linux_sg_package_config.sh
@@ -25,6 +25,7 @@
 # @(#) 2017-04-01: initial version [Patrick Van der Veken]
 # @(#) 2018-05-21: added dump_logs() & other fixes [Patrick Van der Veken]
 # @(#) 2018-10-28: fixed (linter) errors [Patrick Van der Veken]
+# @(#) 2018-11-18: do not trap on signal 0 [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -34,7 +35,7 @@ function check_linux_sg_package_config
 {
 # ------------------------- CONFIGURATION starts here -------------------------
 typeset _CONFIG_FILE="${CONFIG_DIR}/$0.conf"
-typeset _VERSION="2018-10-28"                           # YYYY-MM-DD
+typeset _VERSION="2018-11-18"                           # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="Linux"                    # uname -s match
 typeset _SG_DAEMON="/opt/cmcluster/bin/cmcld"
 # rubbish that cmgetconf outputs to STDOUT instead of STDERR
@@ -61,8 +62,6 @@ typeset _PKG_VALUE=""
 
 # set local trap for cleanup
 # shellcheck disable=SC2064
-trap "rm -f ${_PKG_RUN_FILE}.* ${_PKG_CFG_FILE}.* >/dev/null 2>&1; return 0" 0
-# shellcheck disable=SC2064
 trap "rm -f ${_PKG_RUN_FILE}.* ${_PKG_CFG_FILE}.* >/dev/null 2>&1; return 1" 1 2 3 15
 
 # handle arguments (originally comma-separated)
@@ -171,6 +170,9 @@ do
     done <${_PKG_CFG_FILE}.${_PKG_INSTANCE}
 done
 
+# do cleanup
+rm -f ${_PKG_RUN_FILE}.* ${_PKG_CFG_FILE}.* >/dev/null 2>&1
+
 return 0
 }