Remove left over code
Merge branch 'od/issue_26' into develop