Moved away some annoying weather types, these will be added by an
extension