remove undefined js from init
Merge branch 'master' into pist