Some js debugging clean-up and some removal...