Issue #36: fix feature cruft