removed erroneous assignment
Merge branch 'dev'
Merge branch 'dev'
Removed unnecessary commented out code