remove setTimeout dependancies