Removed unnecessary globals from all files