Comment the exported methods and remove old struct