fix: explicit zone scoping, rmv commented code