[CB-4127] remove dupe code