diff --git a/CHANGES b/CHANGES
index 57d8c07..6db2d42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-2.7 / <not released yet>
+2.7 / 16-May-2021
 
  - Fixed
    - Possibility of segmentation fault with image list output when database
diff --git a/configure b/configure
index a0177b8..05a1acc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vnstat 2.7_beta2.
+# Generated by GNU Autoconf 2.69 for vnstat 2.7.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='vnstat'
 PACKAGE_TARNAME='vnstat'
-PACKAGE_VERSION='2.7_beta2'
-PACKAGE_STRING='vnstat 2.7_beta2'
+PACKAGE_VERSION='2.7'
+PACKAGE_STRING='vnstat 2.7'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vnstat 2.7_beta2 to adapt to many kinds of systems.
+\`configure' configures vnstat 2.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vnstat 2.7_beta2:";;
+     short | recursive ) echo "Configuration of vnstat 2.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1488,7 +1488,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vnstat configure 2.7_beta2
+vnstat configure 2.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2083,7 +2083,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vnstat $as_me 2.7_beta2, which was
+It was created by vnstat $as_me 2.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2949,7 +2949,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='vnstat'
- VERSION='2.7_beta2'
+ VERSION='2.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6320,7 +6320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vnstat $as_me 2.7_beta2, which was
+This file was extended by vnstat $as_me 2.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6386,7 +6386,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-vnstat config.status 2.7_beta2
+vnstat config.status 2.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 74cc1a6..a547a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([vnstat], [2.7_beta2])
+AC_INIT([vnstat], [2.7])
 AM_INIT_AUTOMAKE([foreign subdir-objects std-options -Wall -Werror])
 AM_MAINTAINER_MODE
 
diff --git a/man/vnstat.1 b/man/vnstat.1
index f17ab55..94f25c6 100644
--- a/man/vnstat.1
+++ b/man/vnstat.1
@@ -1,4 +1,4 @@
-.TH VNSTAT 1 "APRIL 2021" "version 2.7" "User Manuals"
+.TH VNSTAT 1 "MAY 2021" "version 2.7" "User Manuals"
 .SH NAME
 vnstat \- a console-based network traffic monitor
 
diff --git a/man/vnstat.conf.5 b/man/vnstat.conf.5
index 804afee..4c0fcf3 100644
--- a/man/vnstat.conf.5
+++ b/man/vnstat.conf.5
@@ -1,4 +1,4 @@
-.TH VNSTAT.CONF 5 "APRIL 2021" "version 2.7" "User Manuals"
+.TH VNSTAT.CONF 5 "MAY 2021" "version 2.7" "User Manuals"
 .SH NAME
 vnstat.conf \- vnStat configuration file
 
diff --git a/man/vnstatd.8 b/man/vnstatd.8
index d194119..7cf0918 100644
--- a/man/vnstatd.8
+++ b/man/vnstatd.8
@@ -1,4 +1,4 @@
-.TH VNSTATD 8 "APRIL 2021" "version 2.7" "User Manuals"
+.TH VNSTATD 8 "MAY 2021" "version 2.7" "User Manuals"
 .SH NAME
 vnstatd \- daemon based database updating for vnStat
 
diff --git a/man/vnstati.1 b/man/vnstati.1
index 562e800..2581fa7 100644
--- a/man/vnstati.1
+++ b/man/vnstati.1
@@ -1,4 +1,4 @@
-.TH VNSTATI 1 "APRIL 2021" "version 2.7" "User Manuals"
+.TH VNSTATI 1 "MAY 2021" "version 2.7" "User Manuals"
 .SH NAME
 vnstati \- png image output support for vnStat
 
diff --git a/src/image.c b/src/image.c
index 2a1ff06..194529a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -969,7 +969,7 @@ int drawfiveminutes(IMAGECONTENT *ic, const int xpos, const int ypos, const int
 		step++;
 	}
 
-	if (debug) { // TODO: cleanup
+	if (debug) {
 		printf("maxrx: %lu\n", datainfo.maxrx);
 		printf("maxtx: %lu\n", datainfo.maxtx);
 		printf("rxh: %d     txh: %d\n", rxh, txh);