Mark bundles as cleanable (Issue #558)