minor removals, links, and buttons