Updated the IRQ code to the new model.
also removed some dead code.

Not tested (the tree is too broken to compile) but this should still 
be better than totally wrong and obsolete code.