Remove unnecessary global variables
Merge pull request #580 from timschofield/develop

Remove unnecessary global variables