Cleanup hardware queue

Some code cleanup. 
Wrong filename - should be ContextISR not IRS :D