Updated package dependency and remove unused functions.