Finish removing ENCAD shifts and table generation