Cleanup hardware queue

Some code cleanup. 
well, makefile does it?