Remove redundant script, Bug fix