Fix a method call which is no longer expecting a collection
Remove old version of the implementation
Add the Canonical transformation