more JS clean-ups