replaced two old type fields with the new role fields
removed the type field from the user table