Issue #30: Deleting garbage