[CB-4121] remove dupe code