diff --git a/ssl-check.sh b/ssl-check.sh
index f3bc592c..48a67160 100755
--- a/ssl-check.sh
+++ b/ssl-check.sh
@@ -158,11 +158,6 @@ date2julian() {
     fi
 }
 
-#############################################################################
-# Purpose: Convert a string month into an integer representation
-# Arguments:
-#   $1 -> Month name (e.g., Sep)
-#############################################################################
 getmonth()
 {
     case ${1} in
@@ -188,8 +183,7 @@ getmonth()
 #   $1 -> Date #1
 #   $2 -> Date #2
 #############################################################################
-date_diff()
-{
+date_diff(){
     if [ "${1}" != "" ] && [ "${2}" != "" ]
     then
         echo $((${2} - ${1}))
@@ -212,12 +206,7 @@ prints() {
     if [ "${QUIET}" != "TRUE" ] && [ "${ISSUER}" = "TRUE" ] && [ "${VALIDATION}" != "TRUE" ]
     then
         MIN_DATE=$(echo $4 | ${AWK} '{ print $1, $2, $4 }')
-        if [ "${NAGIOS}" == "TRUE" ]
-        then
-            ${PRINTF} "%-35s %-17s %-8s %-11s %-4s %-30s\n" "$1:$2" "$6" "$3" "$MIN_DATE" \|days="$5"
-        else
-            ${PRINTF} "%-35s %-17s %-8s %-11s %-4s %-30s\n" "$1:$2" "$6" "$3" "$MIN_DATE" "$5"
-        fi
+        ${PRINTF} "%-35s %-17s %-8s %-11s %-4s %-30s\n" "$1:$2" "$6" "$3" "$MIN_DATE" "$5"
     elif [ "${QUIET}" != "TRUE" ] && [ "${ISSUER}" = "TRUE" ] && [ "${VALIDATION}" == "TRUE" ]
     then
         ${PRINTF} "%-35s %-35s %-32s %-17s\n" "$1:$2" "$7" "$8" "$6"
@@ -225,12 +214,7 @@ prints() {
     elif [ "${QUIET}" != "TRUE" ] && [ "${VALIDATION}" != "TRUE" ]
     then
         MIN_DATE=$(echo $4 | ${AWK} '{ print $1, $2, $4 }')
-        if [ "${NAGIOS}" == "TRUE" ]
-        then
-            ${PRINTF} "%-47s %-12s %-12s %-4s %-30s\n" "$1:$2" "$3" "$MIN_DATE" \|days="$5"
-        else
-            ${PRINTF} "%-47s %-12s %-12s %-4s %-30s\n" "$1:$2" "$3" "$MIN_DATE" "$5"
-        fi
+        ${PRINTF} "%-47s %-12s %-12s %-4s %-30s\n" "$1:$2" "$3" "$MIN_DATE" "$5"
     elif [ "${QUIET}" != "TRUE" ] && [ "${VALIDATION}" == "TRUE" ]
     then
         ${PRINTF} "%-35s %-35s %-32s\n" "$1:$2" "$7" "$8"
@@ -676,21 +660,6 @@ else
     exit 1
 fi
 
-### Remove the temporary files
-if [ $DEBUG == 1 ]
-then
-    echo "DEBUG: Certificate temporary file:"
-    cat ${CERT_TMP}
-    echo "DEBUG: Runtime information file:"
-    cat ${ERROR_TMP}
-fi
-
 rm -f ${CERT_TMP} ${ERROR_TMP}
 
-### Exit with a success indicator
-if [ "${NAGIOS}" = "TRUE" ]
-then
-    exit $RETCODE
-else
-    exit 0
-fi
\ No newline at end of file
+exit 0
\ No newline at end of file