- JS cleanups