diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
index 337b34e50..f7dfb91f8 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
@@ -103,7 +103,7 @@ CreateCircleDialog::CreateCircleDialog()
 #endif
         
     //ui.idChooser->loadIds(0,RsGxsId());
-    ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId());
+    ui.circleComboBox->loadCircles(RsGxsCircleId());
 }
 
 CreateCircleDialog::~CreateCircleDialog()
@@ -604,7 +604,7 @@ void CreateCircleDialog::updateCircleGUI()
             else
 				ui.radioButton_Restricted->setChecked(true);
 
-			ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mCircleGroup.mMeta.mCircleId);
+            ui.circleComboBox->loadCircles(mCircleGroup.mMeta.mCircleId);
 			
 			break;
 
diff --git a/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp b/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp
index 07cc27c6d..2b9927dc8 100644
--- a/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp
@@ -31,14 +31,13 @@
 
 /** Constructor */
 GxsCircleChooser::GxsCircleChooser(QWidget *parent)
-: QComboBox(parent), mFlags(0)
+: QComboBox(parent)
 {
 	return;
 }
 
-void GxsCircleChooser::loadCircles(uint32_t chooserFlags, const RsGxsCircleId &defaultId)
+void GxsCircleChooser::loadCircles(const RsGxsCircleId &defaultId)
 {
-	mFlags = chooserFlags;
 	mDefaultCircleId = defaultId;
 	loadGxsCircles();
 }
@@ -68,14 +67,7 @@ bool MakeGxsCircleDesc(const RsGxsCircleId &id, QString &desc)
 void GxsCircleChooser::loadGxsCircles()
 {
 	std::list<RsGxsCircleId> ids;
-	if (mFlags & GXS_CIRCLE_CHOOSER_EXTERNAL)
-	{
-		rsGxsCircles->getCircleExternalIdList(ids);
-	}
-	if (mFlags & GXS_CIRCLE_CHOOSER_PERSONAL)
-	{
-		rsGxsCircles->getCirclePersonalIdList(ids);
-	}
+    rsGxsCircles->getCircleExternalIdList(ids);
 
 	if (ids.empty())
 	{
diff --git a/retroshare-gui/src/gui/gxs/GxsCircleChooser.h b/retroshare-gui/src/gui/gxs/GxsCircleChooser.h
index 1a5f01fb3..474fbbc22 100644
--- a/retroshare-gui/src/gui/gxs/GxsCircleChooser.h
+++ b/retroshare-gui/src/gui/gxs/GxsCircleChooser.h
@@ -28,11 +28,6 @@
 #include <QComboBox>
 #include <retroshare/rsgxscircles.h>
 
-
-#define GXS_CIRCLE_CHOOSER_EXTERNAL	0x0001
-#define GXS_CIRCLE_CHOOSER_PERSONAL	0x0002
-#define GXS_CIRCLE_CHOOSER_ALLCIRCLES	0x0003  // OR of other two.
-
 class GxsCircleChooser : public QComboBox
 {
         Q_OBJECT
@@ -40,12 +35,11 @@ class GxsCircleChooser : public QComboBox
 public:
 	GxsCircleChooser(QWidget *parent = NULL);
 
-	void loadCircles(uint32_t chooserFlags, const RsGxsCircleId &defaultId);
+    void loadCircles(const RsGxsCircleId &defaultId);
 	bool getChosenCircle(RsGxsCircleId &id);
 
 private:
 	void loadGxsCircles();
-	uint32_t mFlags;
 
 	RsGxsCircleId mDefaultCircleId;
 };
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index 3a7ab9f6a..735d923d3 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -124,7 +124,7 @@ void GxsGroupDialog::init()
 	/* Setup Reasonable Defaults */
 
 	ui.idChooser->loadIds(0,RsGxsId());
-	ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId());
+    ui.circleComboBox->loadCircles(RsGxsCircleId());
     ui.localComboBox->loadGroups(0, RsNodeGroupId());
 	
 	ui.groupDesc->setPlaceholderText(tr("Set a descriptive description here"));
@@ -315,8 +315,6 @@ void GxsGroupDialog::setupDefaults()
     ui.typeGroup_3->setEnabled(false);
     ui.typeLocal_3->setEnabled(false);
 #endif
-    ui.typeLocal->setEnabled(false);	// for now, since local circles not fully tested.
-    ui.typeLocal->setToolTip(tr("This feature is not yet available, but it will be available very soon!"));	// for now, since local circles not fully tested.
 }
 
 void GxsGroupDialog::setupVisibility()
@@ -459,8 +457,8 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
 			distribution_string = tr("Restricted to circle:") ;
             ui.localComboBox->setVisible(false) ;
             ui.distributionCircleComboBox->setVisible(true) ;
-			ui.distributionCircleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId);
-			ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId);
+            ui.distributionCircleComboBox->loadCircles(mGrpMeta.mCircleId);
+            ui.circleComboBox->loadCircles(mGrpMeta.mCircleId);
 			break;
 		default:
 			std::cerr << "CreateCircleDialog::updateCircleGUI() INVALID mCircleType";