Remove SDP server and experimental option

1 files changed, 2 insertions, 13 deletions

diff --git a/src/main.c b/src/main.c
index fbd776a6..1ae7dc46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -784,7 +784,7 @@ int main(int argc, char *argv[])
 	struct sigaction sa;
 	GIOChannel *ctl_io, *child_io;
 	uint16_t mtu = 0;
-	int opt, daemonize = 1, debug = 0, sdp = 1, experimental = 0;
+	int opt, daemonize = 1, debug = 0;
 	GKeyFile *config;
 
 	/* Default HCId settings */
@@ -803,7 +803,7 @@ int main(int argc, char *argv[])
 
 	init_defaults();
 
-	while ((opt = getopt(argc, argv, "ndsm:xf:")) != EOF) {
+	while ((opt = getopt(argc, argv, "ndm:f:")) != EOF) {
 		switch (opt) {
 		case 'n':
 			daemonize = 0;
@@ -813,18 +813,10 @@ int main(int argc, char *argv[])
 			debug = 1;
 			break;
 
-		case 's':
-			sdp = 1;
-			break;
-
 		case 'm':
 			mtu = atoi(optarg);
 			break;
 
-		case 'x':
-			experimental = 1;
-			break;
-
 		case 'f':
 			hcid.config_file = g_strdup(optarg);
 			break;
@@ -907,9 +899,6 @@ int main(int argc, char *argv[])
 
 	agent_init();
 
-	if (experimental)
-		hcid_dbus_set_experimental();
-
 	if (hcid_dbus_init() < 0) {
 		error("Unable to get on D-Bus");
 		exit(1);