[GIERKA] - Removing globals