Remove internal Queue
leftovers
#238
+10
−136
Merged
Queue
leftovers
#238