[#362] Scripts cleanup

@zzgvh Can you check?