These parts should be removed, I think.