Remove globals support