More js cleanup