--- a/trunk/src/canvastip.cpp
+++ b/trunk/src/canvastip.cpp
@@ -3,12 +3,11 @@
 //
 // Description:
 //
-//
 // Author: David Saxton, Alan Grimes <agrimes@speakeasy.net>, (C) 2009
 //
 // Copyright: See COPYING file that comes with this distribution
 //
-//
+
 
 #include <cmath>
 
@@ -67,11 +66,7 @@
 	for (unsigned i = 0; i < num; i++) {
 		if (Wire *wire = econnector->wire(i)) {
 			info[i].V = wire->voltage();
-#ifdef BULLSHIT
 			info[i].I = std::abs(wire->current());
-#else 
-			info[i].I = wire->currentIsKnown() ? std::abs(wire->current()) : NAN;
-#endif
 			info[i].id = -2;
 		}
 	}
@@ -132,7 +127,6 @@
 		.arg(QString::number(info[num].id));
 	}
 
-
 	return QString("%1%2V  %3%4A")
 	       .arg(QString::number(info[num].V / CNItem::getMultiplier(info[num].V), 'g', 3))
 	       .arg(CNItem::getNumberMag(info[num].V))