Minor changes in js
Reslove merge conflict
Remove services dir
Resolve conflict
Add ENV variables to mask credentials