Unused after @dinhviethoa's merge from today: remove for now