Clean up commented code

All the usage subclasses run with their respective shortcircuit counter
but should also run with the base counter
(no programed switch at the moment)
Usage subclasses:
   Xor, And, Or, Nor, Nand (registered under several alias)