Removing old sections, and adding interop