Removed unused variables and outdated comments
Merge pull request #1329 from ojalehto/refactor/libraries/view/remove-unused-variables

Remove unused variables and outdated comments