[STAMM] Removed some global vars