remove now unused variables
turn deprecationwarning into comment