Removing more of decision_matrix code