JS cleanup #2