Cleanup
Merge branch 'hotfix/cleanup'