Remove finalize declaration and commented lines.