JS cleanup.  #350