More JS clean up.