Remove 'metadata' from comments