Cleanup the number of user account states for simplicity