remove errrant tooltip
removed zombie message
Merge branch 'master' into walport-water
debt will be simpler