remove comments for caching