Remove references to deleted code
Merge branch 'develop' into issue-173