Remove globals; refs #414