Revert "a start on canonicalization"

This reverts commit 7d5d4b06782b658994896dc27f15062c9549d1e4.