Canal clean-up

Null