Removing nasty Thread.Sleep