A bit more clean-up.
Remove client watermark code.