unify scope, cleanup after client presence