Cleanup hardware queue

Some code cleanup. 
to jak w końcu z tym?