Call repo.close() instead of manually collecting

Call repo.close() instead of manually collecting #2187