Cleanup of certificates section