removing traces of jump-link and tidying header-block code

https://www.pivotaltracker.com/story/show/45251687 and
https://www.pivotaltracker.com/story/show/45154863