Replaced global citizen refs with local require calls