ECMS-4304 [SANITIZATION] cleanup the script and some others things