Huge contexts refactoring, obsolete removal