Removed some variables from the global scope