New internals for the queue
Remove replaced or unused things