removed context-dependent static variables