MOM-6 refactored a lot of JS, getting rid of some variables and methods and trying to streamline