JS clean-up