removed unneeded uses of Lift2