fix bugs in User.delete and modify related methods
merge