Remove and don't rely on global variables in commands

[mostafa]

Global variables cause a few issues, including causing certain tests to fail and complicate state management. So, they'd be better removed.