js client clean ups