diff --git a/utils/rider_location_cache/rider_location_cache.py b/utils/rider_location_cache/rider_location_cache.py
index 441938e4..0b4e85b6 100644
--- a/utils/rider_location_cache/rider_location_cache.py
+++ b/utils/rider_location_cache/rider_location_cache.py
@@ -9,28 +9,14 @@ import os
 import mysql.connector
 import json
 
-def mysql_connect(user, password, host, database):
-    conn = mysql.connector.connect(user=user,
-        password=password,
-        host=host,
-        database=database)
-    return conn
-
-def init_subscriptions(client, conn):
-    # given mysql connection, get all rider sessions
-    query = ("select id from rider_session")
-    cursor = conn.cursor()
-    cursor.execute(query)
-    for (id) in cursor:
-        print "subscribing to rider session %s" % id
-        client.subscribe('motorider_%s' % id)
-    cursor.close()
+def init_subscriptions(client):
+    print "subscribing to wildcard"
+    client.subscribe('#')
 
 def on_connect(client, userdata, flags, rc):
-    conn = mysql_connect('resq', 'Motolite456', '127.0.0.1', 'resq')
-    init_subscriptions(client, conn)
+    init_subscriptions(client)
     print("Connected with result code "+str(rc))
-    client.subscribe("$SYS/#")
+    # client.subscribe("$SYS/#")
 
 def on_publish(client, userdata, mid):
     pass
@@ -62,18 +48,6 @@ def on_message(client, userdata, message):
     redis_conn.setex(key, 1600, message.payload)
 
 
-
-def getRedis(i):
-    r = redis.StrictRedis(host='localhost', port=6379, db=0)
-    while 1:
-        time.sleep(0)
-        data = r.brpop("events", 10)
-        if data:
-            info = data[1].split('|')
-            print "Channel: " + info[0] + " message: " + info[1]
-            client.publish(info[0], info[1])
-
-
 def sigint_handler(signal, frame):
     print 'Interrupted'
     sys.exit(0)