get rid of a lot of sanitization code, which is also a lot of the Canada-specific code