Merge branch 'issue/585' into 'develop'

SCRUM#585: Remove unused code

See merge request !15
1 job for issue/590 in 12 seconds