Clean up annotations