removed deprecated function calls