Removes warnings
Merge branch 'fix/removing-warning' into develop

* fix/removing-warning:
  Removes warnings