improve cleanup of VCA related objects