Some more tunings for deadline. removed unused modules from config