diff --git a/include/vision/factor/factor_pixel_hp.h b/include/vision/factor/factor_pixel_hp.h
index 1980db7ad53ea619d68ad95e0b05e0dc01839b46..f56bd818594d6cec1e29da238500c761674d2ab1 100644
--- a/include/vision/factor/factor_pixel_hp.h
+++ b/include/vision/factor/factor_pixel_hp.h
@@ -75,7 +75,7 @@ inline FactorPixelHp::FactorPixelHp(const FeatureBasePtr&   _ftr_ptr,
                                                         _ftr_ptr->getCapture()->getSensorP(),
                                                         _ftr_ptr->getCapture()->getSensorO(),
                                                         _landmark_ptr->getP()),
-        intrinsic_(_ftr_ptr->getCapture()->getSensor()->getIntrinsic()->getState()) //TODO: intrinsic
+        intrinsic_(_ftr_ptr->getCapture()->getSensor()->getIntrinsic()->getState())
 {
 //	std::cout << "FactorPixelHp::Constructor\n";
     // obtain some intrinsics from provided sensor
diff --git a/include/vision/factor/factor_trifocal.h b/include/vision/factor/factor_trifocal.h
index c3c762aac9b0bf946a9e4a3e1c63e7c6227f2295..043cfdf1d6a79693791242b6d2c9301a21ba4a24 100644
--- a/include/vision/factor/factor_trifocal.h
+++ b/include/vision/factor/factor_trifocal.h
@@ -206,9 +206,9 @@ FactorTrifocal::FactorTrifocal(const FeatureBasePtr& _feature_1_ptr,
     Matrix<double,3,2> J_e_u3 = J_e_m3 * J_m_u;
 
     // Error covariances induced by each of the measurement covariance // canonical units
-    Matrix3d Q1 = J_e_u1 * _feature_1_ptr   ->getMeasurementCovariance() * J_e_u1.transpose(); // FIXME: changed getFeaturePrev() by _feature_1_ptr
-    Matrix3d Q2 = J_e_u2 * _feature_2_ptr   ->getMeasurementCovariance() * J_e_u2.transpose(); // FIXME: changed getFeatureOther() by _feature_2_ptr
-    Matrix3d Q3 = J_e_u3 * _feature_own_ptr ->getMeasurementCovariance() * J_e_u3.transpose(); // FIXME: changed getFeature() by _feature_own_ptr
+    Matrix3d Q1 = J_e_u1 * _feature_1_ptr   ->getMeasurementCovariance() * J_e_u1.transpose();
+    Matrix3d Q2 = J_e_u2 * _feature_2_ptr   ->getMeasurementCovariance() * J_e_u2.transpose();
+    Matrix3d Q3 = J_e_u3 * _feature_own_ptr ->getMeasurementCovariance() * J_e_u3.transpose();
 
     // Total error covariance // canonical units
     Matrix3d Q = Q1 + Q2 + Q3;