steps: removing refs, adding content fields