JS clean-up...