linking between both and partial cleanup