Remove invalid function
merge marcelkhelr/develop
Merge branch 'develop'