ref: removed code extracted out in previous commits