Deploy script: improve clean up