cleanups
Merge branch 'hotfix/some-cleanups'

* hotfix/some-cleanups:
  cleanups