(maint) fall cleaning

See #171 for previous discussion.