JS cleanup 2