Global vars removed