more js cleanup