Better output deleting and better log warnings
Merge branch 'release/0.6.1'