Increased timout
Import clean up
Added setting the timeout back again.