diff --git a/README.md b/README.md
index 4a7832f..c4689d4 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,8 @@ Devices commonly consist of multiple services: for example, a presence sensor mi
 
 Some services are more common than others. Some are deprecated entirely.
 
-
 todo periodical refresh of devices
 todo periodical refresh of state
-todo handle evt.sensor.report
 
 | Service | Example device | Implementation status |
 | --- | --- | --- |
@@ -143,21 +141,3 @@ todo handle evt.sensor.report
 | technology_specific | | |
 | time | | |
 | version | | |
-
-
-todo add demo mode checkbox? sample data
-<!--
-
-Notes to developers after forking or using the github template feature:
-  - Make sure you adjust the 'version' key in 'example/config.yaml' when you do that.
-  - Make sure you update 'example/CHANGELOG.md' when you do that.
-  - The first time this runs you might need to adjust the image configuration on github container registry to make it public
-  - You may also need to adjust the github Actions configuration (Settings > Actions > General > Workflow > Read & Write)
-- Adjust the 'image' key in 'example/config.yaml' so it points to your username instead of 'home-assistant'.
-  - This is where the build images will be published to.
-- Rename the example directory.
-  - The 'slug' key in 'example/config.yaml' should match the directory name.
-- Adjust all keys/url's that points to 'home-assistant' to now point to your user/fork.
-- Do awesome stuff!
- -->
-
diff --git a/futurehome/README.md b/futurehome/README.md
index ad6e06f..52c3e69 100644
--- a/futurehome/README.md
+++ b/futurehome/README.md
@@ -2,4 +2,4 @@
 
 Futurehome add-on for Home Assistant.
 
-See the main [README.md](https://github.com/adrianjagielak/home-assistant-futurehome/blob/master/README.md)
+See the main README.md [here](https://github.com/adrianjagielak/home-assistant-futurehome/blob/master/README.md).
diff --git a/futurehome/src/ha/publish_device.ts b/futurehome/src/ha/publish_device.ts
index 7bf7f0c..f277078 100644
--- a/futurehome/src/ha/publish_device.ts
+++ b/futurehome/src/ha/publish_device.ts
@@ -128,18 +128,6 @@ type NumberComponent = {
   value_template: string;
 }
 
-// todo button reference
-//     "cmps": {
-//     "bla1": {
-//       "p": "device_automation",
-//       "automation_type": "trigger",
-//       "payload": "short_press",
-//       "topic": "foobar/triggers/button1",
-//       "type": "button_short_press",
-//       "subtype": "button_1"
-//     },
-//   },
-
 export type ServiceComponentsCreationResult = {
   components: { [key: string]: HaComponent };
   commandHandlers?: CommandHandlers;