More JS cleanup