cleanup arity management