Also it seems that just a bunch of constants were duplicated.