finished removing vestigial codes. Clean up