diff --git a/locations-jinja.py b/locations-jinja.py
index c6a7192..77cc32a 100644
--- a/locations-jinja.py
+++ b/locations-jinja.py
@@ -18,70 +18,12 @@ class LocationsWebsite(object):
             
     def get_locations(self):
         locations = self.get_filtered_data()
-#         latitudes = self.get_latitudes()
-#         longitudes = self.get_longitudes()
-#         dates = self.get_dates()
-#         #times = [time[:-7] for time in self.get_times()]
-#         tids = self.get_tids()
-#         times = self.get_report_times()
-#         for i in range(len(latitudes)):
-#             locations.append([longitudes[i],latitudes[i],dates[i],times[i],tids[i]])  #make list of lists to enable jinja render as columns  
         return locations
-   
-    def get_latitudes(self):
-        latitudes = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT latitude FROM Location ORDER BY tid DESC;''')
-            for latitude, in results:
-                latitudes.append(str(latitude))
-        return latitudes
-
-    def get_longitudes(self):
-        longitudes = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT longitude FROM Location ORDER BY tid DESC;''')
-            for longitude, in results:
-                longitudes.append(str(longitude))
-        return longitudes
-    
-    def get_dates(self):
-        dates = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT date FROM Location ORDER BY tid DESC;''')
-            for date, in results:
-                readabledate = time.strftime('%Y-%m-%d', time.localtime(date))
-                dates.append(str(readabledate))
-        return dates
-    
-    def get_times(self):
-        times = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT time FROM Location ORDER BY tid DESC;''')
-            for time, in results:
-                times.append(str(time))
-        return times
-    
-    def get_tids(self):
-        tids = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT tid FROM Location ORDER BY tid DESC;''')
-            for tid, in results:
-                tids.append(str(tid))
-        return tids
-    
-    def get_report_times(self):
-        times = []
-        with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT time FROM Location ORDER BY tid DESC;''')
-            for Time, in results:
-                readabletime = time.strftime('%H:%M:%S', time.localtime(Time))
-                times.append(str(readabletime))
-        return times
     
     def get_filtered_data(self):
         all_data = []
         with sql.connect(DB) as cur:
-            results = cur.execute('''SELECT DISTINCT * FROM Location ORDER BY tid DESC;''')
+            results = cur.execute('''SELECT * FROM Location GROUP BY longitude, latitude,date,tid HAVING COUNT(*) > 1 ORDER BY tid DESC;''')
             for val1,val2,val3,val4,val5, in results: #rename vals to actual 
                 lon = val1
                 lat = val2