diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart
index 65229fd3..a86981e3 100644
--- a/lib/widget/category_display.dart
+++ b/lib/widget/category_display.dart
@@ -19,8 +19,6 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 
-import '../api_form.dart';
-
 class CategoryDisplayWidget extends StatefulWidget {
 
   CategoryDisplayWidget(this.category, {Key? key}) : super(key: key);
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index ec4180c8..c35d408d 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -1,5 +1,4 @@
 import 'package:inventree/api.dart';
-import 'package:inventree/api_form.dart';
 import 'package:inventree/app_colors.dart';
 import 'package:inventree/app_settings.dart';
 import 'package:inventree/barcode.dart';
diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart
index cc9dda08..ed2759f5 100644
--- a/lib/widget/part_detail.dart
+++ b/lib/widget/part_detail.dart
@@ -6,12 +6,10 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:inventree/app_colors.dart';
 
 import 'package:inventree/l10.dart';
-import 'package:inventree/api_form.dart';
 import 'package:inventree/widget/part_notes.dart';
 import 'package:inventree/widget/progress.dart';
 import 'package:inventree/inventree/part.dart';
 import 'package:inventree/widget/category_display.dart';
-import 'package:inventree/widget/part_suppliers.dart';
 import 'package:inventree/api.dart';
 import 'package:inventree/widget/refreshable_state.dart';
 import 'package:inventree/widget/part_image_widget.dart';
@@ -284,16 +282,18 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
     // Tiles for an "assembly" part
     if (part.isAssembly) {
 
-      tiles.add(
-          ListTile(
-            title: Text(L10().billOfMaterials),
-            leading: FaIcon(FontAwesomeIcons.thList),
-            trailing: Text("${part.bomItemCount}"),
-            onTap: () {
-              // TODO
-            }
-        )
-      );
+      if (part.bomItemCount > 0) {
+        tiles.add(
+            ListTile(
+                title: Text(L10().billOfMaterials),
+                leading: FaIcon(FontAwesomeIcons.thList),
+                trailing: Text("${part.bomItemCount}"),
+                onTap: () {
+                  // TODO
+                }
+            )
+        );
+      }
 
       if (part.building > 0) {
         tiles.add(
@@ -310,7 +310,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
     }
 
     // Tiles for "component" part
-    if (part.isComponent) {
+    if (part.isComponent && part.usedInCount > 0) {
 
       tiles.add(
         ListTile(
diff --git a/lib/widget/part_notes.dart b/lib/widget/part_notes.dart
index 5e658e27..484627a0 100644
--- a/lib/widget/part_notes.dart
+++ b/lib/widget/part_notes.dart
@@ -7,8 +7,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:inventree/l10.dart';
 
-import '../api_form.dart';
-
 
 class PartNotesWidget extends StatefulWidget {
 
diff --git a/lib/widget/stock_detail.dart b/lib/widget/stock_detail.dart
index 053b115e..7d27ecb8 100644
--- a/lib/widget/stock_detail.dart
+++ b/lib/widget/stock_detail.dart
@@ -22,8 +22,6 @@ import 'package:inventree/api.dart';
 import 'package:dropdown_search/dropdown_search.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
-import '../api_form.dart';
-
 class StockDetailWidget extends StatefulWidget {
 
   StockDetailWidget(this.item, {Key? key}) : super(key: key);
diff --git a/lib/widget/stock_notes.dart b/lib/widget/stock_notes.dart
index c59f5155..130f863c 100644
--- a/lib/widget/stock_notes.dart
+++ b/lib/widget/stock_notes.dart
@@ -8,7 +8,6 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:inventree/l10.dart';
 
 import '../api.dart';
-import '../api_form.dart';
 
 
 class StockNotesWidget extends StatefulWidget {