#86 JS clean-up