[CB-3113\ remove dupe code