Removes warnings
Merge branch 'fix/remove-warnings' into develop

* fix/remove-warnings:
  Removes warnings