diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComparisonReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComparisonReportFragment.kt
index 5750e3c7..520f9a38 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComparisonReportFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComparisonReportFragment.kt
@@ -27,9 +27,9 @@ class ComparisonReportFragment : AbstractReportFragment() {
 	/**
 	 * Set data
 	 */
-	fun setData(report: Report) {
-		this.setReport(report)
-	}
+//	fun setData(report: Report) {
+//		this.setReport(report)
+//	}
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		super.onCreateView(inflater, container, savedInstanceState)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
index 04036972..aca25041 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
@@ -10,7 +10,11 @@ import io.realm.Realm
 import kotlinx.android.synthetic.main.fragment_composable_table_report.*
 import kotlinx.coroutines.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.*
+import net.pokeranalytics.android.calculus.Calculator
+import net.pokeranalytics.android.calculus.ComputableGroup
+import net.pokeranalytics.android.calculus.Report
+import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.ComputableResult
 import net.pokeranalytics.android.ui.activity.components.ReportActivity
 import net.pokeranalytics.android.ui.adapter.DisplayDescriptor
@@ -35,7 +39,7 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 
 	private var rowRepresentables: ArrayList<RowRepresentable> = ArrayList()
 
-	var statsAdapter: RowRepresentableAdapter? = null
+	private var statsAdapter: RowRepresentableAdapter? = null
 	var report: Report? = null
 
 	companion object {
@@ -214,10 +218,9 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 				hideLoader()
 				report?.let {
 					val title = stat.localizedTitle(requireContext())
-
 					ReportActivity.newInstance(requireContext(), it, title, stat)
-
-//					ProgressReportActivity.newInstanceForResult(requireContext(), stat, it, title = title)
+				} ?: run {
+					throw PAIllegalStateException("Report should never be null here")
 				}
 			}
 		}