removing spare variables
Merge branch 'dev'