[2pc] cleanup common.go