Updated code based on CodePro AnalytiX audit results.
Merge branch 'dev' of https://github.com/alexhenning/wpi-suite-tng into dev-feature-auditfixes
Deleted commented out import statements.
Merge branch 'dev-feature-auditfixes' into dev