Cleanup. Remove parts not needed for soundness.