diff --git a/js/control/Control.js b/js/control/Control.js
deleted file mode 100644
index f1341ca..0000000
--- a/js/control/Control.js
+++ /dev/null
@@ -1,39 +0,0 @@
-BR.Control = L.Control.extend({
-    options: {
-        position: 'bottomleft'
-    },
-
-    onAdd: function (map) {
-        var container = L.DomUtil.create('div', 'info'),
-            heading,
-            div;
-
-        if (this.options.heading) {
-            heading = L.DomUtil.create('div', 'heading', container);
-            heading.innerHTML = this.options.heading;
-            this._content = L.DomUtil.create('div', 'content', container);
-        } else {
-            this._content = container;
-        }
-
-        if (this.options.divId) {
-            div = L.DomUtil.get(this.options.divId);
-            L.DomUtil.removeClass(div, 'hidden');
-            this._content.appendChild(div);
-        }
-
-        var stop = L.DomEvent.stopPropagation;
-        L.DomEvent
-            .on(container, 'click', stop)
-            .on(container, 'mousedown', stop)
-            .on(container, 'dblclick', stop)
-            .on(container, 'mousewheel', stop)
-            .on(container, 'MozMousePixelScroll', stop);
-        // disabled because links not working, remove?
-        //L.DomEvent.on(container, 'click', L.DomEvent.preventDefault);
-
-        return container;
-    }
-});
-
-
diff --git a/js/control/RoutingOptions.js b/js/control/RoutingOptions.js
index 6786660..58bf4db 100644
--- a/js/control/RoutingOptions.js
+++ b/js/control/RoutingOptions.js
@@ -1,6 +1,6 @@
-BR.RoutingOptions = BR.Control.extend({
+BR.RoutingOptions = L.Evented.extend({
     
-    onAdd: function (map) {
+    initialize: function () {
         $('#profile-alternative').on('changed.bs.select', this._getChangeHandler());
 
         // build option list from config
@@ -16,7 +16,6 @@ BR.RoutingOptions = BR.Control.extend({
         profiles_list.children[0].value = "Custom";
         // <custom> profile is empty at start, select next one
         profiles_list.children[1].selected = true;
-        return BR.Control.prototype.onAdd.call(this, map);
     },
 
     refreshUI: function() {
@@ -106,5 +105,3 @@ BR.RoutingOptions = BR.Control.extend({
         }, this);
     }
 });
-
-BR.RoutingOptions.include(L.Evented.prototype);
diff --git a/js/control/TrackMessages.js b/js/control/TrackMessages.js
index 979c56d..6812faa 100644
--- a/js/control/TrackMessages.js
+++ b/js/control/TrackMessages.js
@@ -1,7 +1,6 @@
-BR.TrackMessages = L.Evented.extend({
+BR.TrackMessages = L.Class.extend({
 
     options: {
-        heading: 'Segment data',
         edgeStyle: {
             color: 'yellow',
             opacity: 0.8,
@@ -24,18 +23,15 @@ BR.TrackMessages = L.Evented.extend({
         'InitialCost': { title: 'initial$', className: 'dt-body-right' }
     },
 
-    initialize: function (options) {
+    initialize: function (map, options) {
         L.setOptions(this, options);
+        this._map = map;
 
         var table = document.getElementById('datatable');
         this.tableClassName = table.className;
         this.tableParent = table.parentElement;
     },
 
-    onAdd: function (map) {
-        this._map = map;
-    },
-
     update: function (polyline, segments) {
         var i, messages, columns, headings,
             data = [];
diff --git a/js/index.js b/js/index.js
index f8ed421..d7879d9 100644
--- a/js/index.js
+++ b/js/index.js
@@ -166,7 +166,7 @@
             profile.message.hide();
             routingOptions.setCustomProfile(null);
         });
-        trackMessages = new BR.TrackMessages({
+        trackMessages = new BR.TrackMessages(map, {
             requestUpdate: requestUpdate
         });
 
@@ -222,13 +222,9 @@
             download.update(urls);
         };
 
-        routingOptions.addTo(map);
-
         routing.addTo(map);
         elevation.addBelow(map);
 
-        trackMessages.onAdd(map);
-
         sidebar = BR.sidebar({
             defaultTabId: BR.conf.transit ? 'tab_itinerary' : 'tab_profile',
             listeningTabs: {