cleanups
Merge branch 'hotfix/some-cleanups'

* hotfix/some-cleanups:
  cleanups
Merge tag 'some-cleanups' into develop

v1.99

* tag 'some-cleanups':
  cleanups