Remove unused code and logs
Merge branch 'hotfix/v0.1.1'