Extract HighWatermarking.

Clean up the rest.