wrap all clean methods in a try except finally block
Merge branch 'hotfix/wrapp_garbage'