Revert "Revert "SHDP-353 Remove version 1 specific code""

This reverts commit 60e089e5934732a7d97c2eb803d6e1a0db0b5ee7.