[Improve] remove deprecated functions