JS cleanups