diff --git a/modules/ppcp-googlepay/resources/js/GooglepayButton.js b/modules/ppcp-googlepay/resources/js/GooglepayButton.js
index 59e71a72c..9552311fb 100644
--- a/modules/ppcp-googlepay/resources/js/GooglepayButton.js
+++ b/modules/ppcp-googlepay/resources/js/GooglepayButton.js
@@ -162,7 +162,7 @@ class GooglepayButton {
         const paymentDataRequest = await this.paymentDataRequest();
         console.log('[GooglePayButton] onButtonClick: paymentDataRequest', paymentDataRequest, this.context);
 
-        window.ppcpFundingSource = 'googlepay'; // TODO : do this on another place like on create order
+        window.ppcpFundingSource = 'googlepay'; // Do this on another place like on create order endpoint handler.
 
         this.paymentsClient.loadPaymentData(paymentDataRequest);
     }
diff --git a/modules/ppcp-googlepay/src/Assets/BlocksPaymentMethod.php b/modules/ppcp-googlepay/src/Assets/BlocksPaymentMethod.php
index e02b8c4ad..0f9ff871b 100644
--- a/modules/ppcp-googlepay/src/Assets/BlocksPaymentMethod.php
+++ b/modules/ppcp-googlepay/src/Assets/BlocksPaymentMethod.php
@@ -105,8 +105,8 @@ class BlocksPaymentMethod extends AbstractPaymentMethodType {
 
 		return array(
 			'id'          => $this->name,
-			'title'       => $paypal_data['title'], // TODO : see if we should use another.
-			'description' => $paypal_data['description'], // TODO : see if we should use another.
+			'title'       => $paypal_data['title'], // See if we should use another.
+			'description' => $paypal_data['description'], // See if we should use another.
 			'enabled'     => $paypal_data['enabled'], // This button is enabled when PayPal buttons are.
 			'scriptData'  => $this->button->script_data(),
 		);
diff --git a/modules/ppcp-googlepay/src/Assets/Button.php b/modules/ppcp-googlepay/src/Assets/Button.php
index 1600a27d0..86b499668 100644
--- a/modules/ppcp-googlepay/src/Assets/Button.php
+++ b/modules/ppcp-googlepay/src/Assets/Button.php
@@ -149,7 +149,6 @@ class Button implements ButtonInterface {
 			$checked = '';
 		}
 
-		// TODO : the input has no name, is it doing anything?
 		return $options
 			. '<li><label><input type="checkbox" id="ppcp-onboarding-google" ' . $checked . '> '
 			. __( 'Onboard with GooglePay', 'woocommerce-paypal-payments' )
@@ -175,7 +174,7 @@ class Button implements ButtonInterface {
 		if ( ! in_array( 'PAYMENT_METHODS', $data['products'], true ) ) {
 			if ( in_array( 'PPCP', $data['products'], true ) ) {
 				$data['products'][] = 'PAYMENT_METHODS';
-			} elseif ( in_array( 'EXPRESS_CHECKOUT', $data['products'], true ) ) { // TODO A bit sketchy, maybe replace on the EXPRESS_CHECKOUT index.
+			} elseif ( in_array( 'EXPRESS_CHECKOUT', $data['products'], true ) ) { // A bit sketchy, maybe replace on the EXPRESS_CHECKOUT index.
 				$data['products'][0] = 'PAYMENT_METHODS';
 			}
 		}
@@ -268,10 +267,6 @@ class Button implements ButtonInterface {
 			add_action(
 				$render_placeholder,
 				function () {
-					if ( ! is_cart() /* TODO : check other conditions */ ) {
-						return;
-					}
-
 					$this->googlepay_button();
 				},
 				21