removed some commented code

When having a quick look at the changes i'd made, i noticed a few lines of commented code, some mine, some not. I've removed them.

Refs #8031
Merge branch 'feature/8031_workspace_in_sample_log_name' into develop