More javascript cleanup
More javascript cleanup