diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
index 32166df6d..2005359da 100644
--- a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
+++ b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
@@ -87,7 +87,6 @@ public class MainActivity extends ActionBarActivity {
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
 
-        // TODO move to layout file and save state
         // Add the spinner to select map styles
         Spinner styleSpinner = (Spinner)findViewById(R.id.spinner_style);
         ArrayAdapter styleAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
diff --git a/src/map/map.cpp b/src/map/map.cpp
index bf5509d06..3fe770e8e 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -390,7 +390,6 @@ void Map::setup() {
 void Map::setStyleURL(const std::string &url) {
     // TODO: Make threadsafe.
 
-    // TODO fix this properly
     styleURL = url;
     if (async) {
         stop();