Useless variable removed
Logging for debug removed
Merge branch 'feature/more-code-improvements' into develop