Some cleanup of dependents