cleanup (removed queue.h/c, etc.)