SHDP-353 Remove version 1 specific code