BugFix - Clean JS Script