diff --git a/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt b/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
index efc63551..25ce8221 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
@@ -107,11 +107,11 @@ interface Deletable : Identifiable {
 	/**
 	 * A method to define if an object is safe for deletion in database
 	 */
-	fun isValidForDelete(context: Context, realm: Realm): Boolean
+	fun isValidForDelete(realm: Realm): Boolean
 
 
 	fun getDeleteStatus(context: Context, realm: Realm): DeleteValidityStatus {
-		if (!isValidForDelete(context, realm)) {
+		if (!isValidForDelete(realm)) {
 			return DeleteValidityStatus.INVALID
 		}
 		return DeleteValidityStatus.VALID
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
index 5cfaab03..8f5574a2 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
@@ -66,7 +66,7 @@ open class Bankroll : RealmObject(), NameManageable, RowRepresentable {
 		}
 	}
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		return realm.where<Session>().equalTo("bankroll.id", id).findAll().isEmpty()
 				&& realm.where<Transaction>().equalTo("bankroll.id", id).findAll().isEmpty()
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
index 15dcfc56..503cd90d 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
@@ -121,7 +121,7 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
 		return realm.where(this::class.java).equalTo("name", this.name).and().notEqualTo("id", this.id).findAll().isNotEmpty()
 	}
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		val sessions = realm.where<Session>().contains("customFieldEntries.customField.id", id).findAll()
 		return sessions.isEmpty()
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
index a49cb5ac..c328d4b8 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt
@@ -95,7 +95,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable {
         this.value = value as String? ?: ""
     }
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		if (realm.where<Session>().contains("customFieldEntries.id", id).findAll().isNotEmpty()) {
 			return false
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
index a4b7e84b..d0cbac11 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt
@@ -173,7 +173,7 @@ open class Filter : RealmObject(), RowRepresentable, Identifiable, Deletable, Co
         return this.query.getName(context)
     }
 
-    override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+    override fun isValidForDelete(realm: Realm): Boolean {
 		return true
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
index 8c53f9ff..2334baa0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
@@ -91,7 +91,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
         }
     }
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		return realm.where<Session>().equalTo("game.id", id).findAll().isEmpty()
 	}
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
index 1453941b..df4136e4 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
@@ -59,7 +59,7 @@ open class Location : RealmObject(), NameManageable, RowRepresentable {
         }
 	}
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		return realm.where<Session>().equalTo("location.id", id).findAll().isEmpty()
 	}
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt
index f09a7764..82b996e8 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt
@@ -70,7 +70,7 @@ open class ReportSetup : RealmObject(), RowRepresentable, Deletable {
 
     // Deletable
 
-    override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+    override fun isValidForDelete(realm: Realm): Boolean {
         return true
     }
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
index 1e6ca919..f11f0e73 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
@@ -73,7 +73,7 @@ open class TournamentFeature : RealmObject(), NameManageable, StaticRowRepresent
         }
     }
 
-    override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+    override fun isValidForDelete(realm: Realm): Boolean {
         return realm.where<Session>().equalTo("tournamentFeatures.id", id).findAll().isEmpty()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
index 8c72ba2b..cad45445 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
@@ -67,7 +67,7 @@ open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentabl
         }
 	}
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		return realm.where<Session>().equalTo("tournamentName.id", id).findAll().isEmpty()
 	}
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
index 9e7306b4..9055eb96 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt
@@ -115,7 +115,7 @@ open class Transaction : RealmObject(), Manageable, StaticRowRepresentableDataSo
 		return realm.findById<Transaction>(id) != null
 	}
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		return true
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
index 55f20221..d511ca28 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
@@ -90,7 +90,7 @@ open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentab
 		}
 	}
 
-	override fun isValidForDelete(context: Context, realm: Realm): Boolean {
+	override fun isValidForDelete(realm: Realm): Boolean {
 		return true
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
index cc193389..4dbcb5e4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt
@@ -88,7 +88,7 @@ abstract class DeletableItemFragment : RealmFragment() {
 			val deletableItem = (itemToDelete as Deletable)
 
 			// Check if the object is valid for the deletion
-			if (deletableItem.isValidForDelete(requireContext(), this.getRealm())) {
+			if (deletableItem.isValidForDelete(this.getRealm())) {
 				deletedItem = getRealm().copyFromRealm(itemToDelete)
 				lastDeletedItemPosition = itemPosition
 				getRealm().executeTransaction {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
index 7990e996..cdb038ae 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
@@ -180,7 +180,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		super.onRowDeleted(row)
 		when (row) {
 			is CustomFieldEntry -> {
-				if (!row.isValidForDelete(requireContext(), getRealm())) {
+				if (!row.isValidForDelete(getRealm())) {
 					val status = row.getDeleteStatus(requireContext(), getRealm())
 					val message = row.getFailedDeleteMessage(status)
 					showAlertDialog(requireContext(), R.string.cf_entry_delete_popup_title, message, showCancelButton = true, positiveAction = {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt
index aeb41345..cf0b68c8 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt
@@ -126,7 +126,7 @@ open class DataManagerFragment : RealmFragment() {
 		val deletable = this.item as Deletable
 		val realm = this.getRealm()
 
-		if (deletable.isValidForDelete(requireContext(), realm)) {
+		if (deletable.isValidForDelete(realm)) {
 			val intent = Intent()
 			intent.putExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName, deletable.id)
 			activity?.setResult(Activity.RESULT_OK, intent)