Removed unused references
Removed unused references

(cherry picked from commit 1fcd63bec937b7948e6c591b7fe7b0c0610b7739)
Merge branch 'develop' into nancy