Clean out more interrupt stuff