Removed un-needed globals