diff --git a/README.md b/README.md
index 588727c..4f17e36 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,6 @@ You can specify configuration options either via a config file (default: `config
 | YAML Key                  | Environment Variable      | Default      | Description                                                         |
 |---------------------------|---------------------------|--------------|---------------------------------------------------------------------|
 | `env`                       | `ENVIRONMENT`               | `dev`          | Whether to use development- or production settings                  |
-| `app.cleanup`               | `WAKAPI_CLEANUP`            | `false`        | Whether or not to clean up old heartbeats (be careful!)             |
 | `app.custom_languages`      | -                           | -              | Map from file endings to language names                             |
 | `server.port`               | `WAKAPI_PORT`               | `3000`         | Port to listen on                                                   |
 | `server.listen_ipv4`        | `WAKAPI_LISTEN_IPV4`        | `127.0.0.1`    | Network address to listen on                                        |
diff --git a/config.default.yml b/config.default.yml
index ea0a826..bce61e4 100644
--- a/config.default.yml
+++ b/config.default.yml
@@ -6,7 +6,6 @@ server:
   base_path: /
 
 app:
-  cleanup: false            # only edit, if you know what you're doing
   aggregation_time: '02:15' # time at which to run daily aggregation batch jobs
   custom_languages:
     vue: Vue
diff --git a/config/config.go b/config/config.go
index 70b3370..1a5e1b0 100644
--- a/config/config.go
+++ b/config/config.go
@@ -34,7 +34,6 @@ var (
 )
 
 type appConfig struct {
-	CleanUp         bool              `default:"false" env:"WAKAPI_CLEANUP"`
 	AggregationTime string            `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
 	CustomLanguages map[string]string `yaml:"custom_languages"`
 	LanguageColors  map[string]string `yaml:"-"`
diff --git a/services/heartbeat.go b/services/heartbeat.go
index e6e206a..644e814 100644
--- a/services/heartbeat.go
+++ b/services/heartbeat.go
@@ -8,10 +8,6 @@ import (
 	"github.com/muety/wakapi/models"
 )
 
-const (
-	cleanUpInterval = time.Duration(aggregateIntervalDays) * 2 * 24 * time.Hour
-)
-
 type HeartbeatService struct {
 	config              *config.Config
 	repository          *repositories.HeartbeatRepository
diff --git a/version.txt b/version.txt
index 15b989e..41c11ff 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.16.0
+1.16.1