Javascript cleanup

Javascript cleanup