Fix some (messy) references in js control
Merge branch 'depluginise' into dev