cf-upgrade sanitisation