some cleanup
works sometimes/breaks sometimes on download...