refactored user to remove unused fields