Fix abandoned code