MP1-4135: Removed further references to Weather