Fix packet assembly. Comment obsolete queue.
Remove obsolete commented code.
Be more concise.