Removing calls to the nonexistent  variable.
Merge branch 'develop'