Cleanup hardware queue

Some code cleanup. 
why removed?