Remove js
Merge with master