Further JS cleanup