no logs from cleanup step
Merge branch 'cleanup' into development

* cleanup:
  no logs from cleanup step