For #209 remove all service queuing machinery