Cleanup hardware queue

Some code cleanup. 
no chyba jednak nie.