removed .orig junk
having weird error in User class