more js clean up