cleanup (but see #487 for the dependency regression)