Commenting out the canonicalization parts for the time being