Variable factory deleted, Scope changes