Update features related to User

* Update features related to User
* Remove useless comments