REFACTORING
 - deleted unnecessary lines
 + annotation
Merge branch 'feature/IssueArchiver-ffurkAn' into develop