Canon update

More cleaning