Refactored user type and removed unnecessary information