JS Changes and Cleanups