diff --git a/src/blackcore/blackcore.contextapplication.xml b/src/blackcore/blackcore.contextapplication.xml
deleted file mode 100644
index c8b117afb..000000000
--- a/src/blackcore/blackcore.contextapplication.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="blackcore.contextapplication">
-    <signal name="statusMessage">
-      <arg name="message" type="(sii((iii)(iiii)i))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessage"/>
-    </signal>
-    <signal name="widgetGuiStarting">
-    </signal>
-    <signal name="widgetGuiTerminating">
-    </signal>
-    <method name="ping">
-      <arg type="x" direction="out"/>
-      <arg name="token" type="x" direction="in"/>
-    </method>
-  </interface>
-</node>
diff --git a/src/blackcore/blackcore.contextnetwork.xml b/src/blackcore/blackcore.contextnetwork.xml
deleted file mode 100644
index 4d53d8f5a..000000000
--- a/src/blackcore/blackcore.contextnetwork.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="blackcore.contextnetwork">
-    <signal name="statusMessage">
-      <arg name="message" type="(sii((iii)(iiii)i))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessage"/>
-    </signal>
-    <signal name="statusMessages">
-      <arg name="messages" type="(a(sii((iii)(iiii)i)))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
-    </signal>
-    <signal name="changedAtcStationsOnline">
-    </signal>
-    <signal name="changedAtcStationsBooked">
-    </signal>
-    <signal name="changedAircraftsInRange">
-    </signal>
-    <signal name="connectionTerminated">
-    </signal>
-    <signal name="connectionStatusChanged">
-      <arg name="from" type="u" direction="out"/>
-      <arg name="to" type="u" direction="out"/>
-    </signal>
-    <signal name="textMessagesReceived">
-      <arg name="textMessages" type="(a((ss)(ss)s(dd(s))((iii)(iiii)i)))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CTextMessageList"/>
-    </signal>
-    <method name="readAtcBookingsFromSource">
-    </method>
-    <method name="getAtcStationsOnline">
-      <arg type="(a((ss)(dd(s))(ssss(ss))((dd(s))(dd(s))(dd(s)))(dd(s))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)(si((iii)(iiii)i))(si((iii)(iiii)i))(ssbb)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStationList"/>
-    </method>
-    <method name="getAtcStationsBooked">
-      <arg type="(a((ss)(dd(s))(ssss(ss))((dd(s))(dd(s))(dd(s)))(dd(s))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)(si((iii)(iiii)i))(si((iii)(iiii)i))(ssbb)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStationList"/>
-    </method>
-    <method name="getAircraftsInRange">
-      <arg type="(a((ss)(ssss(ss))(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s))))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAircraftList"/>
-    </method>
-    <method name="getUsers">
-      <arg type="(a(ssss(ss)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
-    </method>
-    <method name="getUsersForCallsigns">
-      <arg type="(a(ssss(ss)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
-      <arg name="callsigns" type="(a(ss))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CCallsignList"/>
-    </method>
-    <method name="getOwnAircraft">
-      <arg type="((ss)(ssss(ss))(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAircraft"/>
-    </method>
-    <method name="connectToNetwork">
-      <arg type="(a(sii((iii)(iiii)i)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
-    </method>
-    <method name="disconnectFromNetwork">
-      <arg type="(a(sii((iii)(iiii)i)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
-    </method>
-    <method name="isConnected">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="setOwnAircraft">
-      <arg type="(a(sii((iii)(iiii)i)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
-      <arg name="aircraft" type="((ss)(ssss(ss))(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s)))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAircraft"/>
-    </method>
-    <method name="updateOwnPosition">
-      <arg name="position" type="((dd(s))(dd(s))(dd(s)))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Geo::CCoordinateGeodetic"/>
-      <arg name="altitude" type="(dd(s)i)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="BlackMisc::Aviation::CAltitude"/>
-    </method>
-    <method name="updateOwnSituation">
-      <arg name="situation" type="(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAircraftSituation"/>
-    </method>
-    <method name="updateOwnCockpit">
-      <arg name="com1" type="(s(dd(s))(dd(s))iiib)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CComSystem"/>
-      <arg name="com2" type="(s(dd(s))(dd(s))iiib)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="BlackMisc::Aviation::CComSystem"/>
-      <arg name="transponder" type="(sii)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="BlackMisc::Aviation::CTransponder"/>
-    </method>
-    <method name="sendTextMessages">
-      <arg name="textMessages" type="(a((ss)(ss)s(dd(s))((iii)(iiii)i)))" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Network::CTextMessageList"/>
-    </method>
-    <method name="getMetar">
-      <arg type="(si((iii)(iiii)i))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CInformationMessage"/>
-      <arg name="airportIcaoCode" type="s" direction="in"/>
-    </method>
-    <method name="getSelectedVoiceRooms">
-      <arg type="(a(ssbb))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoomList"/>
-    </method>
-  </interface>
-</node>
diff --git a/src/blackcore/blackcore.contextsettings.xml b/src/blackcore/blackcore.contextsettings.xml
deleted file mode 100644
index 2f45c2cb9..000000000
--- a/src/blackcore/blackcore.contextsettings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="blackcore.contextsettings">
-    <signal name="changedNetworkSettings">
-    </signal>
-    <method name="getNetworkSettings">
-      <arg type="((sssi(ssss(ss)))(a(sssi(ssss(ss)))))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Settings::CSettingsNetwork"/>
-    </method>
-    <method name="value">
-      <arg type="(a(sii((iii)(iiii)i)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
-      <arg name="path" type="s" direction="in"/>
-      <arg name="command" type="s" direction="in"/>
-      <arg name="value" type="v" direction="in"/>
-      <arg name="unifiedBlackMetaType" type="i" direction="in"/>
-    </method>
-  </interface>
-</node>
diff --git a/src/blackcore/blackcore.contextvoice.xml b/src/blackcore/blackcore.contextvoice.xml
deleted file mode 100644
index 4da1d563f..000000000
--- a/src/blackcore/blackcore.contextvoice.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="blackcore.contextvoice">
-    <method name="getComVoiceRoomsWithAudioStatus">
-      <arg type="(a(ssbb))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoomList"/>
-    </method>
-    <method name="getComVoiceRooms">
-      <arg type="(a(ssbb))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoomList"/>
-    </method>
-    <method name="getCom1VoiceRoom">
-      <arg type="(ssbb)" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoom"/>
-      <arg name="withAudioStatus" type="b" direction="in"/>
-    </method>
-    <method name="getCom2VoiceRoom">
-      <arg type="(ssbb)" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoom"/>
-      <arg name="withAudioStatus" type="b" direction="in"/>
-    </method>
-    <method name="setComVoiceRooms">
-      <arg name="voiceRoomCom1" type="(ssbb)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Voice::CVoiceRoom"/>
-      <arg name="voiceRoomCom2" type="(ssbb)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="BlackMisc::Voice::CVoiceRoom"/>
-    </method>
-    <method name="leaveAllVoiceRooms">
-    </method>
-    <method name="getCom1RoomCallsigns">
-      <arg type="(a(ss))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CCallsignList"/>
-    </method>
-    <method name="getCom2RoomCallsigns">
-      <arg type="(a(ss))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CCallsignList"/>
-    </method>
-    <method name="getCom1RoomUsers">
-      <arg type="(a(ssss(ss)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
-    </method>
-    <method name="getCom2RoomUsers">
-      <arg type="(a(ssss(ss)))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
-    </method>
-    <method name="getAudioDevices">
-      <arg type="(a(unss))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CAudioDeviceList"/>
-    </method>
-    <method name="getCurrentAudioDevices">
-      <arg type="(a(unss))" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CAudioDeviceList"/>
-    </method>
-    <method name="setCurrentAudioDevice">
-      <arg name="audioDevice" type="(unss)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Voice::CAudioDevice"/>
-    </method>
-    <method name="setVolumes">
-      <arg name="com1" type="(s(dd(s))(dd(s))iiibu)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CComSystem"/>
-      <arg name="com2" type="(s(dd(s))(dd(s))iiibu)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="BlackMisc::Aviation::CComSystem"/>
-    </method>
-    <method name="isMuted">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="playSelcalTone">
-      <arg name="selcal" type="(s)" direction="in"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CSelcal"/>
-    </method>
-  </interface>
-</node>