fix(architecture) Attempt to remove global definitions of external resources