cleanup of old method