delete scripts and more improvements