Clean up Thread.sleep