More Thread.sleep removals.