cleanup/refactor remove global