minor cleanup: DEFAULT_CARDINALITY and unused imports