Javascript cleanup
..
...