Removed obsolete Water component.

Liquid has the same properties, but is more general. A separate Water Component is
not required.