Issue #12 - Dead local store removed