Current Status: Remove a few global variables