[OTFC] cleanup commented lines