Remove references to `demographics`
This commit represents part r for issue #58