diff --git a/.nvmrc b/.nvmrc
index 3f430af..6f7f377 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v18
+v16
diff --git a/index.js b/index.js
index 6e30e9c..876c69e 100755
--- a/index.js
+++ b/index.js
@@ -31,7 +31,6 @@ if (semver.lt(process.version, nodeVersion.minimum)) {
 initDockerConnection()
   .then(initScreens)
   .then(function (screen) {
-    // register listener 
     process.on('uncaughtException', (err) => {
       // Make sure the screen is cleared
       screen.teardown()
@@ -42,7 +41,6 @@ initDockerConnection()
     return exitError(err)
   })
 
-  // Returns docker in map 
 function initDockerConnection () {
   return new Promise((resolve, reject) => {
     let utils
@@ -68,7 +66,6 @@ function initDockerConnection () {
   })
 }
 
-// draw screens 
 function initScreens (utils) {
   return new Promise((resolve, reject) => {
     let screen
diff --git a/widgets/actionStatus.widget.js b/widgets/actionStatus.widget.js
index 1d61038..8ed337e 100644
--- a/widgets/actionStatus.widget.js
+++ b/widgets/actionStatus.widget.js
@@ -62,11 +62,6 @@ class myWidget extends baseWidget(EventEmitter) {
 
     this.screen.render()
   }
-
-  // TODO this sucks 
-  renderWidget () {
-    return null
-  }
 }
 
 module.exports = myWidget
diff --git a/widgets/actionsMenu.widget.js b/widgets/actionsMenu.widget.js
index a3fdc1b..caf7e69 100644
--- a/widgets/actionsMenu.widget.js
+++ b/widgets/actionsMenu.widget.js
@@ -25,7 +25,6 @@ class myWidget extends baseWidget() {
     this.widget.setItems(Object.keys(this.menuItems))
   }
 
-  // TODO too tightly coupled
   stopAllContainers () {
     const actionStatus = this.widgetsRepo.get('actionStatus')
     const data = {
@@ -103,7 +102,6 @@ class myWidget extends baseWidget() {
     })
 
     const toolbar = this.widgetsRepo.get('toolbar')
-    // TODO sets up it's handler, bad practice IMO
     toolbar.on('key', (keyString) => {
       // on info keypress m
       if (keyString === 'm') {