Fix interrupt handling (I think!)
Remove worthless check