Although there are still some duplication, in the long run the intention is to remove the old deployment logic and with it all this duplication.