More JS cleaning up
JS clean-up