removed references to cat_user_entity