SmartWater-404: Forgot to remove dead code.