diff --git a/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-page.php b/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-page.php
index 8802d92..8722eb3 100644
--- a/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-page.php
+++ b/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-page.php
@@ -121,8 +121,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
                                                 if ($cat === 'product') {
 
-	                                                $products_total_cost = wiaas_get_package_hardware_procurement_cost($package) +
-                                                                  wiaas_get_package_software_procurement_cost($package);
+	                                                $products_total_cost = wiaas_get_package_product_procurement_cost($package);
 
                                                     esc_html_e('Total: ' . $products_total_cost, 'wiaas');
                                                 }
diff --git a/backend/app/plugins/wiaas/includes/pricing/wiaas-pricing-functions.php b/backend/app/plugins/wiaas/includes/pricing/wiaas-pricing-functions.php
index f178532..fc95fa7 100644
--- a/backend/app/plugins/wiaas/includes/pricing/wiaas-pricing-functions.php
+++ b/backend/app/plugins/wiaas/includes/pricing/wiaas-pricing-functions.php
@@ -50,29 +50,14 @@ function wiaas_get_price_margin($fixed_price, $principal_amount, $total_cost) {
 	return $total_gain - $total_cost;
 }
 
-function wiaas_get_package_hardware_procurement_cost($package) {
+function wiaas_get_package_product_procurement_cost($package){
 	$bundled_items = $package->get_bundled_items();
 	$total_cost = 0;
 
 	foreach ($bundled_items as $bundled_item) {
 		$product = $bundled_item->product;
 
-		if (Wiaas_Product_Category::get_category($product) === 'hardware') {
-			$total_cost += Wiaas_Pricing::get_product_total_cost($product) * $bundled_item->get_quantity();
-		}
-	}
-
-	return $total_cost;
-}
-
-function wiaas_get_package_software_procurement_cost($package) {
-	$bundled_items = $package->get_bundled_items();
-	$total_cost = 0;
-
-	foreach ($bundled_items as $bundled_item) {
-		$product = $bundled_item->product;
-
-		if (Wiaas_Product_Category::get_category($product) === 'software') {
+		if (Wiaas_Product_Category::is_product($product)) {
 			$total_cost += Wiaas_Pricing::get_product_total_cost($product) * $bundled_item->get_quantity();
 		}
 	}
diff --git a/backend/app/plugins/wiaas/includes/product/class-wiaas-product-category.php b/backend/app/plugins/wiaas/includes/product/class-wiaas-product-category.php
index 4e981c3..dcb0dbf 100644
--- a/backend/app/plugins/wiaas/includes/product/class-wiaas-product-category.php
+++ b/backend/app/plugins/wiaas/includes/product/class-wiaas-product-category.php
@@ -86,26 +86,15 @@ class Wiaas_Product_Category {
 	}
 
 	/**
-	 * Determines if provided product is hardware
+	 * Determines if provided product type is product (hardware or software)
 	 * @param $product
 	 *
 	 * @return bool
 	 */
-	public static function is_hardware($product) {
-		return self::_get_product_category_type($product) === 'hardware';
+	public static function is_product($product) {
+		return self::_get_product_category_type($product) === 'product';
 	}
 
-	/**
-	 * Determines if provided product is software
-	 * @param $product
-	 *
-	 * @return bool
-	 */
-	public static function is_software($product) {
-		return self::_get_product_category_type($product) === 'software';
-	}
-
-
 
 	// PRIVATE