Issue #24: Deleting dead code