Cleared out old code.

Made some other fixes, including fixing the nonspecific carryover.