cleanup javascript
merge