Cleans up more code
Merge branch 'fix/cleanup' into develop

* fix/cleanup:
  Cleans up more code