Moved the gateway dedup support over to the new config model