TODO: new plan to kill QueueCreator

Change-Id: I098307063f7645889a39dedafc4d3f862a3f798c