Moved constants and some other junk