Actually this function should be completely removed. We can do it in a follow up.