Removing some unnecessary sleep()s