[Internal] Removed code-duplicates & renamed old legacy function name. Solved several problems with dependencies from the global completion context (= version/debug identifiers/numbers etc)