Clean up. Update after first dry run