Merge pull request #117 from Gedan/master

Controls Update
Removes a few duplicate variables.