diff --git a/src/application_default_credentials.rs b/src/application_default_credentials.rs
index 5caa05c..5b5f2f5 100644
--- a/src/application_default_credentials.rs
+++ b/src/application_default_credentials.rs
@@ -32,7 +32,7 @@ impl ApplicationDefaultCredentialsFlow {
         C: hyper::client::connect::Connect + Clone + Send + Sync + 'static,
     {
         let scope = crate::helper::join(scopes, ",");
-        let token_uri = format!("{}?scopes={}", self.metadata_url, scope); // TODO: This feels jank, can it be done better?
+        let token_uri = format!("{}?scopes={}", self.metadata_url, scope);
         let request = hyper::Request::get(token_uri)
             .header("Metadata-Flavor", "Google")
             .body(hyper::Body::from(String::new())) // why body is needed?
diff --git a/src/authenticator.rs b/src/authenticator.rs
index 5983995..cc9cc1c 100644
--- a/src/authenticator.rs
+++ b/src/authenticator.rs
@@ -257,7 +257,6 @@ impl ServiceAccountAuthenticator {
     }
 }
 
-// TODO: Can those use statements be cleaned up?
 /// Create an authenticator that uses a application default credentials.
 /// ```
 /// # #[cfg(any(feature = "hyper-rustls", feature = "hyper-tls"))]
diff --git a/tests/tests.rs b/tests/tests.rs
index 0711bd7..846e51e 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -604,7 +604,6 @@ async fn test_default_application_credentials_from_metadata_server() {
     let _ = env_logger::try_init();
     let server = Server::run();
     server.expect(
-        // TODO: this does not work.
         Expectation::matching(all_of![
             request::method_path("GET", "/token"),
             request::query(url_decoded(all_of![contains((