remove duplications
code climate
Merge branch 'hotfix/v0.13.4'