[#1] Missed a User replacement

Also remove an unneeded import of User