Removed some commented-out sections of code.
Merge branch 'dev' into test