Remove deprecated function usage