Merge branch 'hotfix/more_tests'
Now with 100% remove methods
Merge branch 'hotfix/remove_method' into develop