Removing unnecessary Global Spaces