Canonicalization

This file should be removed, right?