Remove the Link type and push more logic onto Feed/Entry