[CB-4109] Remove dupe code