Remove enforcecanonical option, it's always active from now