diff --git a/.travis.yml_old b/.travis.yml_old
deleted file mode 100644
index 0ecd6eb8f..000000000
--- a/.travis.yml_old
+++ /dev/null
@@ -1,72 +0,0 @@
-os: linux
-dist: bionic
-language: python
-python:
-  - "3.8"
-
-cache:
-  directories:
-    - ${HOME}/.pio
-
-env:
-  global:
-    - BUILDER_TOTAL_THREADS=1
-    - OWNER=${TRAVIS_REPO_SLUG%/*}
-    - DEV=${OWNER/proddy/dev}
-    - BRANCH=${TRAVIS_BRANCH/dev/}
-    - TAG=${DEV}${BRANCH:+_}${BRANCH}
-
-install:
-  - env | grep TRAVIS
-  - set -e
-  - pip install -U platformio
-  - pio platform update -p
-  - set +e
-
-branches:
-  except:
-    - /^travis-.*-build$/
-
-script:
-  - ./scripts/build.sh
-
-stages:
-  - name: Release
-
-jobs:
-  include:
-    - stage: Release
-
-before_deploy:
-  - export FIRMWARE_VERSION=$(grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk '{print $3}' | sed 's/"//g')
-  - git tag -f travis-${TAG}-build
-  - git remote add gh
-    https://${OWNER}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
-  - git push gh :travis-${TAG}-build || true
-  - git push -f gh travis-${TAG}-build
-  - git remote remove gh
-
-deploy:
-  provider: releases
-  edge:
-    branch: master
-  token: ${GITHUB_TOKEN}
-  file_glob: true
-  file: "*.bin"
-  name: latest development build
-  release_notes:
-    Version $FIRMWARE_VERSION.
-    Automatic firmware builds of the current EMS-ESP branch built on $(date +'%F %T %Z') from commit $TRAVIS_COMMIT.
-    Warning, this is a development build and not fully tested. Use at your own risk.
-  cleanup: false
-  prerelease: true
-  overwrite: true
-  target_commitish: $TRAVIS_COMMIT
-  on:
-    tags: false
-    branch: dev
-
-notifications:
-  email:
-    on_success: change
-    on_failure: change
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a5fc13ea..f385a7056 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,11 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `show commands` command
 - exporting of system settings using the `system info` command in Web and Console. Added link into the Web's Settings page.
 - setting to change how booleans are rendered in MQTT (on/off, true/false, 1/0)
+- Added all remaining devices to Home Assistant's MQTT Discovery. No more yaml files!
 
 ### Fixed
 - fix wwontime readback
 - fixed support for RC300 via MQTT commands (#505)
 - Some minor optimizations to memory handling in the MQTT service
+- Prevent MQTT from publishing empty json payloads
+- Accurate detection of warm water and heating (#515)
 
 ### Changed
 - renamed wWCircPumpType to wWChargeType
@@ -31,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 - Console contexts for thermostat and boiler
+- Removed option to enable/disable the MQTT Heartbeat. It's always on.
+- renamed MQTT topic for Solar Module from `sm_data` to `solar_data`
 
 ## [2.0.1] September 13 2020
 
diff --git a/src/version.h b/src/version.h
index f01b8508d..80a7ab25f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "2.1.0b0"
+#define EMSESP_APP_VERSION "2.1.0b1"