JS cleanup 2.0