Remove unused configuration options
Improve bug occurring with slow container allocation
More polishing