diff --git a/includes/abstracts/abstract-wc-shipping-method.php b/includes/abstracts/abstract-wc-shipping-method.php
index 6edad5f1659..07cb519961a 100644
--- a/includes/abstracts/abstract-wc-shipping-method.php
+++ b/includes/abstracts/abstract-wc-shipping-method.php
@@ -157,11 +157,9 @@ abstract class WC_Shipping_Method extends WC_Settings_API {
 	 *
 	 * @access public
 	 * @return bool
-	 * @todo Must return false if does not
 	 */
 	function has_settings() {
-		if ( $this->has_settings )
-			return true;
+		return ( $this->has_settings );
 	}
 
     /**
@@ -171,9 +169,6 @@ abstract class WC_Shipping_Method extends WC_Settings_API {
      * @return bool
      */
     public function is_available( $package ) {
-		/** @todo Delete this */
-    	global $woocommerce;
-
     	if ( $this->enabled == "no" )
     		return false;
 
@@ -234,4 +229,4 @@ abstract class WC_Shipping_Method extends WC_Settings_API {
 	function supports( $feature ) {
 		return apply_filters( 'woocommerce_shipping_method_supports', in_array( $feature, $this->supports ) ? true : false, $feature, $this );
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/admin/class-wc-admin-assets.php b/includes/admin/class-wc-admin-assets.php
index fee2994ddf4..7e54a0b2317 100644
--- a/includes/admin/class-wc-admin-assets.php
+++ b/includes/admin/class-wc-admin-assets.php
@@ -262,8 +262,7 @@ class WC_Admin_Assets {
 	 */
 	public function product_taxonomy_styles() {
 
-		/** @todo This should be just 'return', without false */
-		if ( ! current_user_can( 'manage_woocommerce' ) ) return false;
+		if ( ! current_user_can( 'manage_woocommerce' ) ) return;
 		?>
 		<style type="text/css">
 			<?php if ( isset($_GET['taxonomy']) && $_GET['taxonomy']=='product_cat' ) : ?>
@@ -278,4 +277,4 @@ class WC_Admin_Assets {
 
 endif;
 
-return new WC_Admin_Assets();
\ No newline at end of file
+return new WC_Admin_Assets();
diff --git a/includes/widgets/class-wc-widget-layered-nav.php b/includes/widgets/class-wc-widget-layered-nav.php
index 67f972f27e2..d546bc91781 100644
--- a/includes/widgets/class-wc-widget-layered-nav.php
+++ b/includes/widgets/class-wc-widget-layered-nav.php
@@ -49,8 +49,7 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 	 */
 	public function form( $instance ) {
 		$this->init_settings();
-		/** @todo This must be only call to parent, with no return. It's a void function */
-		return parent::form( $instance );
+		parent::form( $instance );
 	}
 
 	/**
@@ -386,4 +385,4 @@ class WC_Widget_Layered_Nav extends WC_Widget {
 	}
 }
 
-register_widget( 'WC_Widget_Layered_Nav' );
\ No newline at end of file
+register_widget( 'WC_Widget_Layered_Nav' );