More JS cleanup.