ISSUE-36: removed unused variables