Refactored docs to use adders/removers
Merge pull request #2434 from WouterJ/add_remove

Refactored docs to use adders/removers