diff --git a/static/js/main.js b/static/js/main.js
index e7ad01f..721c34d 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -15,7 +15,6 @@ setInterval(displayLastUpdated, 1000)
 
 const RouteType = {
   TRAM: 1,
-  SUBWAY: 2,
   RAIL: 3,
   BUS: 4,
 }
@@ -175,7 +174,11 @@ function vehiclePopupContent(vehicle) {
   }
 
   if (vehicle.nearest_station) {
-    content += `<br />@ ${vehicle.nearest_station.name}`
+    let station = vehicle.nearest_station.name
+    if (station.toLowerCase().endsWith("station")) {
+      station = station.replace(/ station$/i, "")
+    }
+    content += `<br />@ ${station}`
   }
 
   content += `<br /><br /><small>vehicle #: ${vehicle.id} &middot; trip ID: ${vehicle.trip_id}</small>`