Resolve "cleanup some things"

Dominik Hebelerrequested to merge
1187-cleanup-some-things into development

Closes #1187 (closed)

Edited by Dominik Hebeler

Merge request reports