Refactor User and delete unused file