More deprec functions, code deprec warning free