Removed deprecated usages of old functions.