update functions
remove deprecated functions