Revert changes to remove pacing, and better optimizer settings