Add overall timeouts

created timeouts and ensured that we remove results after upload
As a general thought - you should try to keep comments as concise as possible. Make the code clearer instead