Removes feed links and relational links
Merge branch 'clean-up' into development