Js cleanup

@shayhowe @ajself